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

Modular cirq: cirq.google is extracted #3957

Merged
merged 5 commits into from
Apr 19, 2021
Merged

Conversation

balopat
Copy link
Contributor

@balopat balopat commented Mar 23, 2021

This PR extracts cirq.google into cirq_google.

This is a huge change that I don't really see how could be broken up to smaller pieces. It will probably stick around for a couple of weeks until all the downstream system's testing is done.

Major features:

  • user code using cirq.google is going to get a DeprecationWarning, but otherwise will still work
  • cirq will become a "metapackage"
    • pip install cirq will install cirq, cirq-core and cirq-google
    • pip install cirq-google will install cirq-core and cirq-google
  • all scripts, CI config, notebooks and release scripts have been reconfigured

Testable versions:

The plan: get consensus and sign-off from all major stakeholders and impacted downstream projects (cirq, qsim, quantum OS, TFQ, QCS) and then merge. I do have the changes somewhat scripted that makes it easier to keep the branch up to date with master - there is probably not going to be a need for a code freeze as such.

There are several commits that allow for easier review:

  • in-place changes
  • new files
  • cirq.google -> cirq_google rename
  • final move of the modules

Note that this includes currently #3948 which adds an extra commit at the beginning.

@google-cla google-cla bot added the cla: yes Makes googlebot stop complaining. label Mar 23, 2021
@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@balopat balopat force-pushed the master branch 3 times, most recently from 546bece to 1a150fd Compare March 23, 2021 22:29
@balopat balopat force-pushed the master branch 10 times, most recently from fd96791 to ef8a487 Compare April 13, 2021 20:02
@balopat balopat changed the title [WIP] Extracting cirq.google Extract cirq.google Apr 14, 2021
@balopat balopat changed the title Extract cirq.google Monorepo structure: cirq.google is extracted Apr 14, 2021
@balopat balopat changed the title Monorepo structure: cirq.google is extracted Modular cirq: cirq.google is extracted Apr 14, 2021
dev_tools/pypath Outdated Show resolved Hide resolved
Copy link
Collaborator

@95-martin-orion 95-martin-orion left a comment

Choose a reason for hiding this comment

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

Bundle of setup.py nits.

setup.py Show resolved Hide resolved
cirq-google/setup.py Outdated Show resolved Hide resolved
cirq-google/requirements.txt Show resolved Hide resolved
cirq-google/setup.py Outdated Show resolved Hide resolved
cirq-core/setup.py Outdated Show resolved Hide resolved
check/pytest Show resolved Hide resolved
cirq-google/cirq_google/api/v1/params.py Show resolved Hide resolved
Copy link
Collaborator

@95-martin-orion 95-martin-orion left a comment

Choose a reason for hiding this comment

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

LGTM from me. As double-approval has been requested on this PR, I'm leaving the final "Approve" flag-flip to Doug.

@balopat balopat force-pushed the master branch 3 times, most recently from 082247c to 27dba9d Compare April 19, 2021 21:15
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.

None yet

6 participants