Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
include requirements.txt
include LICENSE
recursive-include recirq extra-requirements.txt
9 changes: 3 additions & 6 deletions dev_tools/write-ci-requirements.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,10 @@ def main(*, out_fn: str = 'ci-requirements.txt', relative_cirq_version: str = 'c
core_reqs = _parse_requirements(REPO_DIR / 'requirements.txt')
core_reqs = _set_cirq_version(core_reqs, relative_cirq_version)

extras_require = [
'otoc', 'qaoa', 'optimize', 'hfvqe', 'fermi_hubbard', 'qml_lfe',
'seniority_zero', 'qcqmc', 'contextuality', 'qec_memory'
]
requirements_files = (REPO_DIR / 'recirq').glob('*/extra-requirements.txt')
extras_require = {
r: _parse_requirements(pathlib.Path(REPO_DIR / f'recirq/{r}/extra-requirements.txt'))
for r in extras_require
req_file.parent.name: _parse_requirements(req_file)
for req_file in sorted(requirements_files)
}
extras_require['qaoa'] = _set_qaoa_hacks(extras_require['qaoa'], relative_cirq_version)

Expand Down
10 changes: 4 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,11 @@ def _parse_requirements(path: pathlib.Path):


install_requires = _parse_requirements(pathlib.Path('requirements.txt'))
extras_require = [
'otoc', 'qaoa', 'optimize', 'hfvqe', 'fermi_hubbard', 'qml_lfe',
'seniority_zero', 'qcqmc', 'qec_memory'
]
requirements_files = list(pathlib.Path('recirq').glob('*/extra-requirements.txt'))
assert requirements_files, 'No recirq/*/extra-requirements.txt files found'
extras_require = {
r: _parse_requirements(pathlib.Path(f'recirq/{r}/extra-requirements.txt'))
for r in extras_require
req_file.parent.name: _parse_requirements(req_file)
for req_file in sorted(requirements_files)
}

# TODO(gh-231): remove and require users to install via extras_require.
Expand Down
Loading