Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extract cirq-pasqal #4241

Merged
merged 25 commits into from
Jun 30, 2021
Merged

Extract cirq-pasqal #4241

merged 25 commits into from
Jun 30, 2021

Conversation

balopat
Copy link
Contributor

@balopat balopat commented Jun 21, 2021

Extracts cirq-pasqal as a separate module.

Merge after #4239, a fix for json testing and deprecation warning deduping and #4250, a fix for flnyt / minimal pytest dependencies (it contains them currently)

@balopat balopat requested review from cduck, HGSilveri, vtomole and a team as code owners June 21, 2021 15:47
@balopat balopat requested a review from dstrain115 June 21, 2021 15:47
@google-cla google-cla bot added the cla: yes Makes googlebot stop complaining. label Jun 21, 2021
@balopat balopat added the status/blocked This PR is blocked on another issue label Jun 22, 2021
@balopat
Copy link
Contributor Author

balopat commented Jun 22, 2021

Blocked on #4250 and #4239.

@balopat balopat requested a review from ColemanCollins as a code owner June 23, 2021 22:25
@balopat balopat removed the status/blocked This PR is blocked on another issue label Jun 25, 2021
Copy link
Collaborator

@dstrain115 dstrain115 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with a few minor nits.

cirq-pasqal/cirq_pasqal/__init__.py Outdated Show resolved Hide resolved
@@ -1,4 +1,4 @@
# Copyright 2020 The Cirq Developers
# Copyright 2021 The Cirq Developers
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I am not sure if it matters, but this init file renaming is weird. It is taking the top-level init to the json_test_data init which makes the diff look funny and screws up git blame. I am not sure it matters too much though, if we can't figure out how to fix it.

cirq-pasqal/setup.py Outdated Show resolved Hide resolved
@balopat balopat added the automerge Tells CirqBot to sync and merge this PR. (If it's running.) label Jun 29, 2021
@CirqBot CirqBot added the front_of_queue_automerge CirqBot uses this label to indicate (and remember) what's being merged next. label Jun 29, 2021
@CirqBot
Copy link
Collaborator

CirqBot commented Jun 29, 2021

Automerge cancelled: A required status check is not present.

Missing statuses: ['Build docs', 'Build protos', 'Changed files test', 'Coverage check', 'Doc test', 'Format check', 'Lint check', 'Misc check', 'Notebook formatting', 'Pytest MacOS (3.7)', 'Pytest MacOS (3.8)', 'Pytest Ubuntu (3.7)', 'Pytest Ubuntu (3.8)', 'Pytest Windows (3.7)', 'Pytest Windows (3.8)', 'Type check']

@CirqBot CirqBot removed automerge Tells CirqBot to sync and merge this PR. (If it's running.) front_of_queue_automerge CirqBot uses this label to indicate (and remember) what's being merged next. labels Jun 29, 2021
@balopat balopat added the automerge Tells CirqBot to sync and merge this PR. (If it's running.) label Jun 30, 2021
@CirqBot CirqBot added the front_of_queue_automerge CirqBot uses this label to indicate (and remember) what's being merged next. label Jun 30, 2021
@CirqBot CirqBot merged commit 55417ee into quantumlib:master Jun 30, 2021
@CirqBot CirqBot removed automerge Tells CirqBot to sync and merge this PR. (If it's running.) front_of_queue_automerge CirqBot uses this label to indicate (and remember) what's being merged next. labels Jun 30, 2021
rht pushed a commit to rht/Cirq that referenced this pull request May 1, 2023
Extracts cirq-pasqal as a separate module.

Merge after quantumlib#4239, a fix for json testing and deprecation warning deduping and quantumlib#4250, a fix for flnyt / minimal pytest dependencies (it contains them currently)
harry-phasecraft pushed a commit to PhaseCraft/Cirq that referenced this pull request Oct 31, 2024
Extracts cirq-pasqal as a separate module.

Merge after quantumlib#4239, a fix for json testing and deprecation warning deduping and quantumlib#4250, a fix for flnyt / minimal pytest dependencies (it contains them currently)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes Makes googlebot stop complaining.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants