Skip to content

[Backport release-25.05] python3Packages.cirq: 1.4.1-unstable-2024-09-21 -> 1.5.0#409974

Merged
wolfgangwalther merged 8 commits intorelease-25.05from
backport-407718-to-release-25.05
Jun 1, 2025
Merged

[Backport release-25.05] python3Packages.cirq: 1.4.1-unstable-2024-09-21 -> 1.5.0#409974
wolfgangwalther merged 8 commits intorelease-25.05from
backport-407718-to-release-25.05

Conversation

@nixpkgs-ci
Copy link
Contributor

@nixpkgs-ci nixpkgs-ci bot commented May 23, 2025

Bot-based backport to release-25.05, triggered by a label in #407718.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-committer, if you find that it is not acceptable, leave a comment.

sarahec added 7 commits May 23, 2025 00:53
@sarahec @github-actions
python3Packages.cirq-core: 1.4.1-unstable-2024-09-21 -> 1.5.0
7976ad1 
Changelog: https://github.com/quantumlib/Cirq/releases/tag/v1.5.0
(cherry picked from commit 00040b3)
@sarahec @github-actions
python3Packages.typedunits: init at 0-unstable-2505-05-09
b70410c 
(cherry picked from commit 44859d9)
@sarahec @github-actions
python3Packages.cirq-google: add dependency on typedunits
2d565c5 
(cherry picked from commit 0e6a84a)
@sarahec @github-actions
python3Packages.cirq-aqt: replace broken dependency substitution with…
9f046ca 
… relaxed dep

(cherry picked from commit 7c87d32)
@sarahec @github-actions
python3Packages.cirq-ionq: replace broken dependency substitution wit…
9533219 
…h relaxed dep

(cherry picked from commit 8870079)
@sarahec @github-actions
python3Packages.cirq-pasqal: replace broken dependency substitution w…
41267a9 
…ith relaxed dep

(cherry picked from commit 213d00a)
@sarahec @github-actions
python3Packages.cirq-regetti: relax qcs-sdk-python dep
b6e0f96 
(cherry picked from commit ba1bad3)
@nixpkgs-ci nixpkgs-ci bot mentioned this pull request May 23, 2025
Merged
13 tasks
@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 4.workflow: backport This targets a stable branch labels May 23, 2025
@nix-owners nix-owners bot requested a review from natsukium May 23, 2025 00:55
@github-actions github-actions bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels May 23, 2025
@nix-owners nix-owners bot requested review from drewrisinger and fabaff May 23, 2025 00:59
@wolfgangwalther wolfgangwalther requested a review from sarahec June 1, 2025 08:05
@wolfgangwalther
Copy link
Contributor

wolfgangwalther commented Jun 1, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 409974
Commit: b6e0f9642c4be728939ac1ea0c116af310acfe4f

x86_64-linux

✅ 36 packages built:
  • python312Packages.cirq
  • python312Packages.cirq-aqt
  • python312Packages.cirq-aqt.dist
  • python312Packages.cirq-core
  • python312Packages.cirq-core.dist
  • python312Packages.cirq-google
  • python312Packages.cirq-google.dist
  • python312Packages.cirq-ionq
  • python312Packages.cirq-ionq.dist
  • python312Packages.cirq-pasqal
  • python312Packages.cirq-pasqal.dist
  • python312Packages.cirq-rigetti
  • python312Packages.cirq-rigetti.dist
  • python312Packages.cirq-web
  • python312Packages.cirq-web.dist
  • python312Packages.cirq.dist
  • python312Packages.stim
  • python312Packages.stim.dist
  • python312Packages.typedunits
  • python312Packages.typedunits.dist
  • python313Packages.cirq-aqt
  • python313Packages.cirq-aqt.dist
  • python313Packages.cirq-core
  • python313Packages.cirq-core.dist
  • python313Packages.cirq-google
  • python313Packages.cirq-google.dist
  • python313Packages.cirq-ionq
  • python313Packages.cirq-ionq.dist
  • python313Packages.cirq-pasqal
  • python313Packages.cirq-pasqal.dist
  • python313Packages.cirq-web
  • python313Packages.cirq-web.dist
  • python313Packages.stim
  • python313Packages.stim.dist
  • python313Packages.typedunits
  • python313Packages.typedunits.dist

aarch64-linux

❌ 10 packages failed to build:
  • python312Packages.cirq
  • python312Packages.cirq-google
  • python312Packages.cirq-google.dist
  • python312Packages.cirq.dist
  • python312Packages.typedunits
  • python312Packages.typedunits.dist
  • python313Packages.cirq-google
  • python313Packages.cirq-google.dist
  • python313Packages.typedunits
  • python313Packages.typedunits.dist
✅ 26 packages built:
  • python312Packages.cirq-aqt
  • python312Packages.cirq-aqt.dist
  • python312Packages.cirq-core
  • python312Packages.cirq-core.dist
  • python312Packages.cirq-ionq
  • python312Packages.cirq-ionq.dist
  • python312Packages.cirq-pasqal
  • python312Packages.cirq-pasqal.dist
  • python312Packages.cirq-rigetti
  • python312Packages.cirq-rigetti.dist
  • python312Packages.cirq-web
  • python312Packages.cirq-web.dist
  • python312Packages.stim
  • python312Packages.stim.dist
  • python313Packages.cirq-aqt
  • python313Packages.cirq-aqt.dist
  • python313Packages.cirq-core
  • python313Packages.cirq-core.dist
  • python313Packages.cirq-ionq
  • python313Packages.cirq-ionq.dist
  • python313Packages.cirq-pasqal
  • python313Packages.cirq-pasqal.dist
  • python313Packages.cirq-web
  • python313Packages.cirq-web.dist
  • python313Packages.stim
  • python313Packages.stim.dist

x86_64-darwin

✅ 36 packages built:
  • python312Packages.cirq
  • python312Packages.cirq-aqt
  • python312Packages.cirq-aqt.dist
  • python312Packages.cirq-core
  • python312Packages.cirq-core.dist
  • python312Packages.cirq-google
  • python312Packages.cirq-google.dist
  • python312Packages.cirq-ionq
  • python312Packages.cirq-ionq.dist
  • python312Packages.cirq-pasqal
  • python312Packages.cirq-pasqal.dist
  • python312Packages.cirq-rigetti
  • python312Packages.cirq-rigetti.dist
  • python312Packages.cirq-web
  • python312Packages.cirq-web.dist
  • python312Packages.cirq.dist
  • python312Packages.stim
  • python312Packages.stim.dist
  • python312Packages.typedunits
  • python312Packages.typedunits.dist
  • python313Packages.cirq-aqt
  • python313Packages.cirq-aqt.dist
  • python313Packages.cirq-core
  • python313Packages.cirq-core.dist
  • python313Packages.cirq-google
  • python313Packages.cirq-google.dist
  • python313Packages.cirq-ionq
  • python313Packages.cirq-ionq.dist
  • python313Packages.cirq-pasqal
  • python313Packages.cirq-pasqal.dist
  • python313Packages.cirq-web
  • python313Packages.cirq-web.dist
  • python313Packages.stim
  • python313Packages.stim.dist
  • python313Packages.typedunits
  • python313Packages.typedunits.dist

aarch64-darwin

✅ 36 packages built:
  • python312Packages.cirq
  • python312Packages.cirq-aqt
  • python312Packages.cirq-aqt.dist
  • python312Packages.cirq-core
  • python312Packages.cirq-core.dist
  • python312Packages.cirq-google
  • python312Packages.cirq-google.dist
  • python312Packages.cirq-ionq
  • python312Packages.cirq-ionq.dist
  • python312Packages.cirq-pasqal
  • python312Packages.cirq-pasqal.dist
  • python312Packages.cirq-rigetti
  • python312Packages.cirq-rigetti.dist
  • python312Packages.cirq-web
  • python312Packages.cirq-web.dist
  • python312Packages.cirq.dist
  • python312Packages.stim
  • python312Packages.stim.dist
  • python312Packages.typedunits
  • python312Packages.typedunits.dist
  • python313Packages.cirq-aqt
  • python313Packages.cirq-aqt.dist
  • python313Packages.cirq-core
  • python313Packages.cirq-core.dist
  • python313Packages.cirq-google
  • python313Packages.cirq-google.dist
  • python313Packages.cirq-ionq
  • python313Packages.cirq-ionq.dist
  • python313Packages.cirq-pasqal
  • python313Packages.cirq-pasqal.dist
  • python313Packages.cirq-web
  • python313Packages.cirq-web.dist
  • python313Packages.stim
  • python313Packages.stim.dist
  • python313Packages.typedunits
  • python313Packages.typedunits.dist
Error logs: `aarch64-linux`
python312Packages.typedunits 
        assert u.float_to_twelths_frac(501.0 / 3) == frac(167)
        assert u.float_to_twelths_frac(502.0 / 3) == frac(502, 3)

    # Precision.
    assert u.float_to_twelths_frac((1 << 55) + 1) == frac((1 << 55) + 1)





  assert u.float_to_twelths_frac(float(1 << 55) / 3.0) == frac(1 << 55, 3)





test/cython/test_frac.py:128:




tunits/core/cython/frac.pyx:83: in tunits_core.float_to_twelths_frac

cpdef frac float_to_twelths_frac(a) except *:






raise ValueError("Not a twelfth.")

E   ValueError: Not a twelfth.




tunits/core/cython/frac.pyx:90: ValueError

=========================== short test summary info ============================

FAILED test/cython/test_frac.py::test_float_to_twelths_frac - ValueError: Not a twelfth.

======================== 1 failed, 887 passed in 3.29s =========================

python313Packages.typedunits 
        assert u.float_to_twelths_frac(501.0 / 3) == frac(167)
        assert u.float_to_twelths_frac(502.0 / 3) == frac(502, 3)

    # Precision.
    assert u.float_to_twelths_frac((1 << 55) + 1) == frac((1 << 55) + 1)





  assert u.float_to_twelths_frac(float(1 << 55) / 3.0) == frac(1 << 55, 3)





test/cython/test_frac.py:128:




tunits/core/cython/frac.pyx:83: in tunits_core.float_to_twelths_frac

cpdef frac float_to_twelths_frac(a) except *:






raise ValueError("Not a twelfth.")

E   ValueError: Not a twelfth.




tunits/core/cython/frac.pyx:90: ValueError

=========================== short test summary info ============================

FAILED test/cython/test_frac.py::test_float_to_twelths_frac - ValueError: Not a twelfth.

======================== 1 failed, 887 passed in 3.23s =========================

python3Packages.typedunits is introduced here so the build failure is not breaking something existing. Still, it builds fine for aarch64-linux on master, so worth investigating (?).

@sarahec
Copy link
Contributor

sarahec commented Jun 1, 2025

The broken test is supposedly disabled:

  disabledTests = lib.optionals stdenv.hostPlatform.isAarch [
    # Rounding differences
    "test_float_to_twelths_frac"
  ];

@wolfgangwalther
Copy link
Contributor

wolfgangwalther commented Jun 1, 2025

The broken test is supposedly disabled:

  disabledTests = lib.optionals stdenv.hostPlatform.isAarch [
    # Rounding differences
    "test_float_to_twelths_frac"
  ];

I see isDarwin in the diff, not isAarch.

@sarahec sarahec mentioned this pull request Jun 1, 2025
Closed
13 tasks
@sarahec
Copy link
Contributor

sarahec commented Jun 1, 2025

Fix in #412990

@sarahec
Copy link
Contributor

sarahec commented Jun 1, 2025

Canceling the backport for now.

@sarahec sarahec closed this Jun 1, 2025
@wolfgangwalther
Copy link
Contributor

wolfgangwalther commented Jun 1, 2025

Wait, I think there's something else going on...

this PR has:

  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [

Your new fix PR changes it from IsAarch to isAarch64.

Has there been another fix inbetween that we should just add to this PR?

@sarahec
Copy link
Contributor

sarahec commented Jun 1, 2025

The broken test is supposedly disabled:

  disabledTests = lib.optionals stdenv.hostPlatform.isAarch [
    # Rounding differences
    "test_float_to_twelths_frac"
  ];

I see isDarwin in the diff, not isAarch.

Oh! The backport picked up a commit one back from current.

@wolfgangwalther
Copy link
Contributor

wolfgangwalther commented Jun 1, 2025

We just need to add the commit from #410612 in here.

@sarahec
Copy link
Contributor

sarahec commented Jun 1, 2025

We just need to add the commit from #410612 in here.

Yes. I'm not a committer so you may have to do it.

@wolfgangwalther
Copy link
Contributor

wolfgangwalther commented Jun 1, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 409974
Commit: 837569c583e8e3032d5179b80c3cdec47357add0

x86_64-linux

✅ 36 packages built:
  • python312Packages.cirq
  • python312Packages.cirq-aqt
  • python312Packages.cirq-aqt.dist
  • python312Packages.cirq-core
  • python312Packages.cirq-core.dist
  • python312Packages.cirq-google
  • python312Packages.cirq-google.dist
  • python312Packages.cirq-ionq
  • python312Packages.cirq-ionq.dist
  • python312Packages.cirq-pasqal
  • python312Packages.cirq-pasqal.dist
  • python312Packages.cirq-rigetti
  • python312Packages.cirq-rigetti.dist
  • python312Packages.cirq-web
  • python312Packages.cirq-web.dist
  • python312Packages.cirq.dist
  • python312Packages.stim
  • python312Packages.stim.dist
  • python312Packages.typedunits
  • python312Packages.typedunits.dist
  • python313Packages.cirq-aqt
  • python313Packages.cirq-aqt.dist
  • python313Packages.cirq-core
  • python313Packages.cirq-core.dist
  • python313Packages.cirq-google
  • python313Packages.cirq-google.dist
  • python313Packages.cirq-ionq
  • python313Packages.cirq-ionq.dist
  • python313Packages.cirq-pasqal
  • python313Packages.cirq-pasqal.dist
  • python313Packages.cirq-web
  • python313Packages.cirq-web.dist
  • python313Packages.stim
  • python313Packages.stim.dist
  • python313Packages.typedunits
  • python313Packages.typedunits.dist

aarch64-linux

✅ 36 packages built:
  • python312Packages.cirq
  • python312Packages.cirq-aqt
  • python312Packages.cirq-aqt.dist
  • python312Packages.cirq-core
  • python312Packages.cirq-core.dist
  • python312Packages.cirq-google
  • python312Packages.cirq-google.dist
  • python312Packages.cirq-ionq
  • python312Packages.cirq-ionq.dist
  • python312Packages.cirq-pasqal
  • python312Packages.cirq-pasqal.dist
  • python312Packages.cirq-rigetti
  • python312Packages.cirq-rigetti.dist
  • python312Packages.cirq-web
  • python312Packages.cirq-web.dist
  • python312Packages.cirq.dist
  • python312Packages.stim
  • python312Packages.stim.dist
  • python312Packages.typedunits
  • python312Packages.typedunits.dist
  • python313Packages.cirq-aqt
  • python313Packages.cirq-aqt.dist
  • python313Packages.cirq-core
  • python313Packages.cirq-core.dist
  • python313Packages.cirq-google
  • python313Packages.cirq-google.dist
  • python313Packages.cirq-ionq
  • python313Packages.cirq-ionq.dist
  • python313Packages.cirq-pasqal
  • python313Packages.cirq-pasqal.dist
  • python313Packages.cirq-web
  • python313Packages.cirq-web.dist
  • python313Packages.stim
  • python313Packages.stim.dist
  • python313Packages.typedunits
  • python313Packages.typedunits.dist

x86_64-darwin

✅ 36 packages built:
  • python312Packages.cirq
  • python312Packages.cirq-aqt
  • python312Packages.cirq-aqt.dist
  • python312Packages.cirq-core
  • python312Packages.cirq-core.dist
  • python312Packages.cirq-google
  • python312Packages.cirq-google.dist
  • python312Packages.cirq-ionq
  • python312Packages.cirq-ionq.dist
  • python312Packages.cirq-pasqal
  • python312Packages.cirq-pasqal.dist
  • python312Packages.cirq-rigetti
  • python312Packages.cirq-rigetti.dist
  • python312Packages.cirq-web
  • python312Packages.cirq-web.dist
  • python312Packages.cirq.dist
  • python312Packages.stim
  • python312Packages.stim.dist
  • python312Packages.typedunits
  • python312Packages.typedunits.dist
  • python313Packages.cirq-aqt
  • python313Packages.cirq-aqt.dist
  • python313Packages.cirq-core
  • python313Packages.cirq-core.dist
  • python313Packages.cirq-google
  • python313Packages.cirq-google.dist
  • python313Packages.cirq-ionq
  • python313Packages.cirq-ionq.dist
  • python313Packages.cirq-pasqal
  • python313Packages.cirq-pasqal.dist
  • python313Packages.cirq-web
  • python313Packages.cirq-web.dist
  • python313Packages.stim
  • python313Packages.stim.dist
  • python313Packages.typedunits
  • python313Packages.typedunits.dist

aarch64-darwin

✅ 36 packages built:
  • python312Packages.cirq
  • python312Packages.cirq-aqt
  • python312Packages.cirq-aqt.dist
  • python312Packages.cirq-core
  • python312Packages.cirq-core.dist
  • python312Packages.cirq-google
  • python312Packages.cirq-google.dist
  • python312Packages.cirq-ionq
  • python312Packages.cirq-ionq.dist
  • python312Packages.cirq-pasqal
  • python312Packages.cirq-pasqal.dist
  • python312Packages.cirq-rigetti
  • python312Packages.cirq-rigetti.dist
  • python312Packages.cirq-web
  • python312Packages.cirq-web.dist
  • python312Packages.cirq.dist
  • python312Packages.stim
  • python312Packages.stim.dist
  • python312Packages.typedunits
  • python312Packages.typedunits.dist
  • python313Packages.cirq-aqt
  • python313Packages.cirq-aqt.dist
  • python313Packages.cirq-core
  • python313Packages.cirq-core.dist
  • python313Packages.cirq-google
  • python313Packages.cirq-google.dist
  • python313Packages.cirq-ionq
  • python313Packages.cirq-ionq.dist
  • python313Packages.cirq-pasqal
  • python313Packages.cirq-pasqal.dist
  • python313Packages.cirq-web
  • python313Packages.cirq-web.dist
  • python313Packages.stim
  • python313Packages.stim.dist
  • python313Packages.typedunits
  • python313Packages.typedunits.dist

@wolfgangwalther wolfgangwalther merged commit 645e6fe into release-25.05 Jun 1, 2025
15 of 18 checks passed
@wolfgangwalther wolfgangwalther deleted the backport-407718-to-release-25.05 branch June 1, 2025 18:22
@sarahec
Copy link
Contributor

sarahec commented Jun 1, 2025

@wolfgangwalther I appreciate the help. Thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@natsukium natsukium Awaiting requested review from natsukium

@fabaff fabaff Awaiting requested review from fabaff

@drewrisinger drewrisinger Awaiting requested review from drewrisinger

@sarahec sarahec Awaiting requested review from sarahec

Assignees

No one assigned

Labels

4.workflow: backport This targets a stable branch 6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@wolfgangwalther @sarahec