python312Packages.cirq-core: 1.4.0 -> 1.4.1 (#338568)

pkgs/development/python-modules/cirq-core/default.nix

@@ -1,39 +1,38 @@
 {
   lib,
   stdenv,
-  buildPythonPackage,
-  pythonOlder,
-  fetchFromGitHub,
   attrs,
+  autoray ? null,
+  buildPythonPackage,
   duet,
+  fetchFromGitHub,
+  freezegun,
   matplotlib,
   networkx,
   numpy,
+  opt-einsum,
   pandas,
+  ply,
+  pylatex ? null,
+  pyquil ? null,
+  pytest-asyncio,
+  pytestCheckHook,
+  pythonOlder,
+  quimb ? null,
   requests,
   scipy,
+  setuptools,
   sortedcontainers,
   sympy,
   tqdm,
   typing-extensions,
-  # Contrib requirements
   withContribRequires ? false,
-  autoray ? null,
-  opt-einsum,
-  ply,
-  pylatex ? null,
-  pyquil ? null,
-  quimb ? null,
-  # test inputs
-  pytestCheckHook,
-  freezegun,
-  pytest-asyncio,
 }:
 
 buildPythonPackage rec {
   pname = "cirq-core";
-  version = "1.4.0";
-  format = "setuptools";
+  version = "1.4.1";
+  pyproject = true;
 
   disabled = pythonOlder "3.9";
 
@@ -41,7 +40,7 @@ buildPythonPackage rec {
     owner = "quantumlib";
     repo = "cirq";
     rev = "refs/tags/v${version}";
-    hash = "sha256-KHwVq0qVtc8E9i2lugILYNwk9awq952w0x4DM+HG7Pg=";
+    hash = "sha256-1GcRDVgYF+1igZQFlQbiWZmU1WNIJh4CcOftQe6OP6I=";
   };
 
   sourceRoot = "${src.name}/${pname}";
@@ -51,7 +50,9 @@ buildPythonPackage rec {
       --replace "matplotlib~=3.0" "matplotlib"
   '';
 
-  propagatedBuildInputs =
+  build-system = [ setuptools ];
+
+  dependencies =
     [
       attrs
       duet

pkgs/development/python-modules/cirq-ft/default.nix

@@ -1,45 +0,0 @@
-{
-  attrs,
-  buildPythonPackage,
-  cachetools,
-  cirq-core,
-  ipython,
-  ipywidgets,
-  nbconvert,
-  nbformat,
-  pytestCheckHook,
-  setuptools,
-}:
-
-buildPythonPackage rec {
-  pname = "cirq-ft";
-  pyproject = true;
-  inherit (cirq-core) version src meta;
-
-  sourceRoot = "${src.name}/${pname}";
-
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [
-    attrs
-    cachetools
-    cirq-core
-    ipython
-    ipywidgets
-    nbconvert
-    nbformat
-  ];
-
-  nativeCheckInputs = [
-    ipython
-    pytestCheckHook
-  ];
-
-  disabledTests = [
-    # Upstream doesn't always adjust the version
-    "test_version"
-  ];
-
-  # cirq's importlib hook doesn't work here
-  #pythonImportsCheck = [ "cirq_ft" ];
-}

pkgs/development/python-modules/cirq-rigetti/default.nix

@@ -84,9 +84,4 @@ buildPythonPackage rec {
 
   # cirq's importlib hook doesn't work here
   #pythonImportsCheck = [ "cirq_rigetti" ];
-
-  meta = cirq-core.meta // {
-    # ModuleNotFoundError: No module named 'pyquil.parser'
-    broken = lib.versionAtLeast pyquil.version "4";
-  };
 }

pkgs/development/python-modules/cirq/default.nix

@@ -2,7 +2,6 @@
   buildPythonPackage,
   cirq-aqt,
   cirq-core,
-  cirq-ft,
   cirq-google,
   cirq-ionq,
   cirq-pasqal,
@@ -19,7 +18,6 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     cirq-aqt
     cirq-core
-    cirq-ft
     cirq-ionq
     cirq-google
     cirq-rigetti
@@ -34,7 +32,6 @@ buildPythonPackage rec {
   disabledTestPaths = [
     "cirq-aqt"
     "cirq-core"
-    "cirq-ft"
     "cirq-google"
     "cirq-ionq"
     "cirq-pasqal"

pkgs/development/python-modules/duet/default.nix

@@ -3,25 +3,33 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
+  pythonOlder,
+  setuptools,
   typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "duet";
-  version = "0.2.7";
-  format = "setuptools";
+  version = "0.2.9";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "duet";
-    rev = "v${version}";
-    hash = "sha256-9CTAupAxZI1twoLpgr7VfECw70QunE6pk+SskiT3JDw=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-P7JxUigD7ZyhtocV+YuAVxuUYVa4F7PpXuA1CCmcMvg=";
   };
 
-  propagatedBuildInputs = [ typing-extensions ];
+  build-system = [ setuptools ];
+
+  dependencies = [ typing-extensions ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  pythonImportsCheck = [ "duet" ];
+
   meta = with lib; {
     description = "Simple future-based async library for python";
     homepage = "https://github.com/google/duet";

pkgs/top-level/python-aliases.nix

@@ -98,6 +98,7 @@ mapAliases ({
   chiavdf = throw "chiavdf has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
   chia-rs = throw "chia-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
   class-registry = phx-class-registry; # added 2021-10-05
+  cirq-ft = throw "cirq-ft is not longer provieded by cirq upstream"; # added 2024-08-31
   cld2-cffi = throw "cld2-cffi has been removed, as the last release was in 2016"; # added 2024-05-20
   clvm = throw "clvm has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
   clvm-rs = throw "clvm-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26

pkgs/top-level/python-packages.nix

@@ -2219,8 +2219,6 @@ self: super: with self; {
 
   cirq-core = callPackage ../development/python-modules/cirq-core { };
 
-  cirq-ft = callPackage ../development/python-modules/cirq-ft { };
-
   cirq-ionq = callPackage ../development/python-modules/cirq-ionq { };
 
   cirq-google = callPackage ../development/python-modules/cirq-google { };