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_aqt #4157

Merged
merged 34 commits into from
Jun 12, 2021
Merged

Extract cirq_aqt #4157

merged 34 commits into from
Jun 12, 2021

Conversation

balopat
Copy link
Contributor

@balopat balopat commented Jun 2, 2021

Extracts cirq.aqt to cirq_aqt.

Also:

  • consolidated package building with the release.yml job (dev_tools/packaging/produce-package.sh)
  • consolidated module listing logic in scripts to use the new modules.py utility:
  • adds a utility to list modules that can be used from bash scripts as well as python scripts, it parses the setup.py files and can list metadata from that information (in the future we can do mass updates to version files, etc.):
source dev_tools/pypath
python3 dev_tools/modules.py --help 
usage: A utility for modules. [-h] {list} ...

optional arguments:
  -h, --help  show this help message and exit

subcommands:
  valid subcommands

  {list}      additional help
    list      lists all the modules
python3 dev_tools/modules.py list --help 
usage: A utility for modules. list [-h] [--mode {folder,package-path}] [--include-parent]

optional arguments:
  -h, --help            show this help message and exit
  --mode {folder,package-path}
                        'folder' to list root folder for module, 'package-path' for top level python package path
  --include-parent      whether to include the parent package or not

@balopat balopat requested review from cduck, ma5x, pschindler, vtomole and a team as code owners June 2, 2021 06:08
@balopat balopat requested a review from maffoo June 2, 2021 06:08
@google-cla google-cla bot added the cla: yes Makes googlebot stop complaining. label Jun 2, 2021
cirq-aqt/README.rst Outdated Show resolved Hide resolved
.github/workflows/release-master.yml Outdated Show resolved Hide resolved
cirq-aqt/cirq_aqt/_version.py Outdated Show resolved Hide resolved
cirq-aqt/cirq_aqt/aqt_sampler.py Outdated Show resolved Hide resolved
dev_tools/modules.py Outdated Show resolved Hide resolved
dev_tools/modules.py Show resolved Hide resolved
dev_tools/modules_test.py Outdated Show resolved Hide resolved
dev_tools/modules_test_data/mod2/pack2/_version.py Outdated Show resolved Hide resolved
dev_tools/modules_test_data/mod1/pack1/_version.py Outdated Show resolved Hide resolved
dev_tools/version_test.py Outdated Show resolved Hide resolved
@balopat
Copy link
Contributor Author

balopat commented Jun 3, 2021

Thanks for the review @maffoo - ready for another look!

@balopat balopat requested a review from maffoo June 3, 2021 23:57
@balopat balopat added the automerge Tells CirqBot to sync and merge this PR. (If it's running.) label Jun 11, 2021
@CirqBot
Copy link
Collaborator

CirqBot commented Jun 11, 2021

Automerge cancelled: A status check is failing.

@CirqBot CirqBot removed the automerge Tells CirqBot to sync and merge this PR. (If it's running.) label Jun 11, 2021
@balopat balopat added the automerge Tells CirqBot to sync and merge this PR. (If it's running.) label Jun 11, 2021
@CirqBot CirqBot added the front_of_queue_automerge CirqBot uses this label to indicate (and remember) what's being merged next. label Jun 11, 2021
@CirqBot
Copy link
Collaborator

CirqBot commented Jun 11, 2021

Automerge cancelled: A status check is failing.

@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 11, 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.

It looks good to me. Just a few minor nits.

cirq-aqt/README.rst Outdated Show resolved Hide resolved
dev_tools/modules.py Outdated Show resolved Hide resolved
dev_tools/modules.py Show resolved Hide resolved
@balopat
Copy link
Contributor Author

balopat commented Jun 11, 2021

I will wait for #4192 to be merged before I merge this.

@balopat balopat added the automerge Tells CirqBot to sync and merge this PR. (If it's running.) label Jun 12, 2021
@CirqBot CirqBot added the front_of_queue_automerge CirqBot uses this label to indicate (and remember) what's being merged next. label Jun 12, 2021
@CirqBot CirqBot merged commit b43eaaa into quantumlib:master Jun 12, 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 12, 2021
rht pushed a commit to rht/Cirq that referenced this pull request May 1, 2023
Extracts cirq.aqt to cirq_aqt. 

Also: 

- consolidated package building with the `release.yml` job (`dev_tools/packaging/produce-package.sh`)
- consolidated module listing logic in scripts to use the new modules.py utility:
- adds a utility to list modules that can be used from bash scripts as well as python scripts, it parses the setup.py files and can list metadata from that information (in the future we can do mass updates to version files, etc.): 

```
source dev_tools/pypath
python3 dev_tools/modules.py --help 
```

```
usage: A utility for modules. [-h] {list} ...

optional arguments:
  -h, --help  show this help message and exit

subcommands:
  valid subcommands

  {list}      additional help
    list      lists all the modules
```


```
python3 dev_tools/modules.py list --help 
```

```
usage: A utility for modules. list [-h] [--mode {folder,package-path}] [--include-parent]

optional arguments:
  -h, --help            show this help message and exit
  --mode {folder,package-path}
                        'folder' to list root folder for module, 'package-path' for top level python package path
  --include-parent      whether to include the parent package or not

```
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

4 participants