pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #259208 from fabaff/cirq-bump

python311Packages.cirq-core: 1.1.0 -> 1.2.0

authored by Fabian Affolter and committed by GitHub 51c0a839 e2246cd1

+69 -30
unified split
+6 -17
pkgs/development/python-modules/cirq-core/default.nix
··· 4 , pythonAtLeast 5 , pythonOlder 6 , fetchFromGitHub 7 - , fetchpatch 8 , duet 9 , matplotlib 10 , networkx ··· 32 33 buildPythonPackage rec { 34 pname = "cirq-core"; 35 - version = "1.1.0"; 36 format = "setuptools"; 37 38 - # Upstream package is broken on Python 3.11 https://github.com/quantumlib/Cirq/issues/6018 39 - disabled = pythonOlder "3.7" || pythonAtLeast "3.11"; 40 41 src = fetchFromGitHub { 42 owner = "quantumlib"; 43 repo = "cirq"; 44 rev = "refs/tags/v${version}"; 45 - hash = "sha256-5j4hbG95KRfRQTyyZgoNp/eHIcy0FphyEhbYnzyUMO4="; 46 }; 47 48 sourceRoot = "${src.name}/${pname}"; 49 50 - patches = [ 51 - # https://github.com/quantumlib/Cirq/pull/5991 52 - (fetchpatch { 53 - url = "https://build.opensuse.org/public/source/openSUSE:Factory/python-cirq/cirq-pr5991-np1.24.patch?rev=8"; 54 - stripLen = 1; 55 - hash = "sha256-d2FpaxM1PsPWT9ZM9v2gVrnLCy9zmvkkyAVgo85eL3U="; 56 - }) 57 - ]; 58 - 59 postPatch = '' 60 substituteInPlace requirements.txt \ 61 - --replace "matplotlib~=3.0" "matplotlib" \ 62 - --replace "networkx~=2.4" "networkx" \ 63 - --replace "numpy>=1.16,<1.24" "numpy" 64 ''; 65 66 propagatedBuildInputs = [ ··· 106 "test_json_and_repr_data" 107 # Tests for some changed error handling behavior in SymPy 1.12 108 "test_custom_value_not_implemented" 109 ]; 110 111 meta = with lib; {
··· 4 , pythonAtLeast 5 , pythonOlder 6 , fetchFromGitHub 7 , duet 8 , matplotlib 9 , networkx ··· 31 32 buildPythonPackage rec { 33 pname = "cirq-core"; 34 + version = "1.2.0"; 35 format = "setuptools"; 36 37 + disabled = pythonOlder "3.9"; 38 39 src = fetchFromGitHub { 40 owner = "quantumlib"; 41 repo = "cirq"; 42 rev = "refs/tags/v${version}"; 43 + hash = "sha256-KEei5PJ0ammsduZVmMh2vaW3f58DYI4BCrFCl/SjUoo="; 44 }; 45 46 sourceRoot = "${src.name}/${pname}"; 47 48 postPatch = '' 49 substituteInPlace requirements.txt \ 50 + --replace "matplotlib~=3.0" "matplotlib" 51 ''; 52 53 propagatedBuildInputs = [ ··· 93 "test_json_and_repr_data" 94 # Tests for some changed error handling behavior in SymPy 1.12 95 "test_custom_value_not_implemented" 96 + # Calibration issue 97 + "test_xeb_to_calibration_layer" 98 ]; 99 100 meta = with lib; {
+36
pkgs/development/python-modules/cirq-ft/default.nix
···
··· 1 + { attrs 2 + , buildPythonPackage 3 + , cachetools 4 + , cirq-core 5 + , ipython 6 + , ipywidgets 7 + , nbconvert 8 + , nbformat 9 + , pytestCheckHook 10 + }: 11 + 12 + buildPythonPackage rec { 13 + pname = "cirq-ft"; 14 + inherit (cirq-core) version src meta; 15 + 16 + sourceRoot = "${src.name}/${pname}"; 17 + 18 + propagatedBuildInputs = [ 19 + attrs 20 + cachetools 21 + cirq-core 22 + ipython 23 + ipywidgets 24 + nbconvert 25 + nbformat 26 + ]; 27 + 28 + nativeCheckInputs = [ 29 + ipython 30 + pytestCheckHook 31 + ]; 32 + 33 + # cirq's importlib hook doesn't work here 34 + #pythonImportsCheck = [ "cirq_ft" ]; 35 + 36 + }
+7
pkgs/development/python-modules/cirq-google/default.nix
··· 4 , protobuf 5 , pytestCheckHook 6 , freezegun 7 }: 8 9 buildPythonPackage rec { ··· 17 --replace "google-api-core[grpc] >= 1.14.0, < 2.0.0dev" "google-api-core[grpc] >= 1.14.0, < 3.0.0dev" \ 18 --replace "protobuf >= 3.15.0, < 4" "protobuf >= 3.15.0" 19 ''; 20 21 propagatedBuildInputs = [ 22 cirq-core ··· 40 # unittest.mock.InvalidSpecError: Cannot autospec attr 'QuantumEngineServiceClient' 41 "test_get_engine_sampler_explicit_project_id" 42 "test_get_engine_sampler" 43 ]; 44 45 }
··· 4 , protobuf 5 , pytestCheckHook 6 , freezegun 7 + , pythonRelaxDepsHook 8 }: 9 10 buildPythonPackage rec { ··· 18 --replace "google-api-core[grpc] >= 1.14.0, < 2.0.0dev" "google-api-core[grpc] >= 1.14.0, < 3.0.0dev" \ 19 --replace "protobuf >= 3.15.0, < 4" "protobuf >= 3.15.0" 20 ''; 21 + 22 + nativeBuildInputs = [ 23 + pythonRelaxDepsHook 24 + ]; 25 26 propagatedBuildInputs = [ 27 cirq-core ··· 45 # unittest.mock.InvalidSpecError: Cannot autospec attr 'QuantumEngineServiceClient' 46 "test_get_engine_sampler_explicit_project_id" 47 "test_get_engine_sampler" 48 + # Calibration issue 49 + "test_xeb_to_calibration_layer" 50 ]; 51 52 }
+15 -13
pkgs/development/python-modules/cirq-rigetti/default.nix
··· 31 32 sourceRoot = "${src.name}/${pname}"; 33 34 postPatch = '' 35 - substituteInPlace requirements.txt \ 36 - --replace "attrs~=20.3.0" "attrs" \ 37 - --replace "certifi~=2021.5.30" "certifi" \ 38 - --replace "h11~=0.9.0" "h11" \ 39 - --replace "httpcore~=0.11.1" "httpcore" \ 40 - --replace "httpx~=0.15.5" "httpx" \ 41 - --replace "idna~=2.10" "idna" \ 42 - --replace "pyjwt~=1.7.1" "pyjwt" \ 43 - --replace "qcs-api-client~=0.8.0" "qcs-api-client" \ 44 - --replace "iso8601~=0.1.14" "iso8601" \ 45 - --replace "rfc3986~=1.5.0" "rfc3986" \ 46 - --replace "pyquil~=3.0.0" "pyquil" \ 47 - --replace "pydantic~=1.8.2" "pydantic" 48 # Remove outdated test 49 rm cirq_rigetti/service_test.py 50 '';
··· 31 32 sourceRoot = "${src.name}/${pname}"; 33 34 + pythonRelaxDeps = [ 35 + "attrs" 36 + "certifi" 37 + "h11" 38 + "httpcore" 39 + "httpx" 40 + "idna" 41 + "iso8601" 42 + "pydantic" 43 + "pyjwt" 44 + "pyquil" 45 + "qcs-api-client" 46 + "rfc3986" 47 + ]; 48 + 49 postPatch = '' 50 # Remove outdated test 51 rm cirq_rigetti/service_test.py 52 '';
+3
pkgs/development/python-modules/cirq/default.nix
··· 1 { buildPythonPackage 2 , cirq-aqt 3 , cirq-core 4 , cirq-google 5 , cirq-ionq 6 , cirq-pasqal ··· 16 propagatedBuildInputs = [ 17 cirq-aqt 18 cirq-core 19 cirq-ionq 20 cirq-google 21 cirq-rigetti ··· 32 disabledTestPaths = [ 33 "cirq-aqt" 34 "cirq-core" 35 "cirq-google" 36 "cirq-ionq" 37 "cirq-pasqal"
··· 1 { buildPythonPackage 2 , cirq-aqt 3 , cirq-core 4 + , cirq-ft 5 , cirq-google 6 , cirq-ionq 7 , cirq-pasqal ··· 17 propagatedBuildInputs = [ 18 cirq-aqt 19 cirq-core 20 + cirq-ft 21 cirq-ionq 22 cirq-google 23 cirq-rigetti ··· 34 disabledTestPaths = [ 35 "cirq-aqt" 36 "cirq-core" 37 + "cirq-ft" 38 "cirq-google" 39 "cirq-ionq" 40 "cirq-pasqal"
+2
pkgs/top-level/python-packages.nix
··· 1983 1984 cirq-core = callPackage ../development/python-modules/cirq-core { }; 1985 1986 cirq-ionq = callPackage ../development/python-modules/cirq-ionq { }; 1987 1988 cirq-google = callPackage ../development/python-modules/cirq-google { };
··· 1983 1984 cirq-core = callPackage ../development/python-modules/cirq-core { }; 1985 1986 + cirq-ft = callPackage ../development/python-modules/cirq-ft { }; 1987 + 1988 cirq-ionq = callPackage ../development/python-modules/cirq-ionq { }; 1989 1990 cirq-google = callPackage ../development/python-modules/cirq-google { };