diff --git a/pkgs/development/python-modules/cirq-ft/default.nix b/pkgs/development/python-modules/cirq-ft/default.nix index d307191dd9af..a0fbbc40da1f 100644 --- a/pkgs/development/python-modules/cirq-ft/default.nix +++ b/pkgs/development/python-modules/cirq-ft/default.nix @@ -7,15 +7,20 @@ , nbconvert , nbformat , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "cirq-ft"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ attrs cachetools @@ -31,6 +36,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Upstream doesn't always adjust the version + "test_version" + ]; + # cirq's importlib hook doesn't work here #pythonImportsCheck = [ "cirq_ft" ]; diff --git a/pkgs/development/python-modules/cirq-google/default.nix b/pkgs/development/python-modules/cirq-google/default.nix index 4f185c825c34..c2d36a4f796d 100644 --- a/pkgs/development/python-modules/cirq-google/default.nix +++ b/pkgs/development/python-modules/cirq-google/default.nix @@ -1,27 +1,23 @@ { buildPythonPackage , cirq-core +, freezegun , google-api-core , protobuf , pytestCheckHook -, freezegun , pythonRelaxDepsHook +, setuptools }: buildPythonPackage rec { pname = "cirq-google"; - format = "setuptools"; + pyproject = true; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "google-api-core[grpc] >= 1.14.0, < 2.0.0dev" "google-api-core[grpc] >= 1.14.0, < 3.0.0dev" \ - --replace "protobuf >= 3.15.0, < 4" "protobuf >= 3.15.0" - ''; - nativeBuildInputs = [ pythonRelaxDepsHook + setuptools ]; propagatedBuildInputs = [ @@ -40,6 +36,8 @@ buildPythonPackage rec { "cirq_google/_version_test.py" # Trace/BPT trap: 5 "cirq_google/engine/calibration_test.py" + # Very time-consuming + "cirq_google/engine/*_test.py" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 0b38510d6603..60ed1433794a 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -6,7 +6,7 @@ , httpx , iso8601 , poetry-core -, pydantic +, pydantic_1 , pyjwt , pytest-asyncio , pytestCheckHook @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "qcs-api-client"; version = "0.23.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -46,6 +46,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "attrs" "httpx" + "iso8601" ]; nativeBuildInputs = [ @@ -57,7 +58,7 @@ buildPythonPackage rec { attrs httpx iso8601 - pydantic + pydantic_1 pyjwt python-dateutil retrying