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
2 changes: 1 addition & 1 deletion dev_tools/requirements/deps/runtime.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ numpy>=1.24,<2.0
pubchempy
requests~=2.32.2

scipy>=1.10,<1.14
scipy~=1.15

sympy
4 changes: 2 additions & 2 deletions dev_tools/requirements/envs/dev.env.txt
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ rpds-py==0.22.3
# via
# jsonschema
# referencing
scipy==1.13.1
scipy==1.15.1
# via
# -r deps/runtime.txt
# ase
Expand Down Expand Up @@ -212,7 +212,7 @@ traitlets==5.14.3
# nbformat
types-networkx==3.4.2.20241227
# via -r deps/mypy.txt
types-pytz==2024.2.0.20241221
types-pytz==2025.1.0.20250204
# via pandas-stubs
types-requests==2.32.0.20241016
# via -r deps/mypy.txt
Expand Down
2 changes: 1 addition & 1 deletion dev_tools/requirements/envs/format.env.txt
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ requests==2.32.3
# via
# -c envs/dev.env.txt
# -r deps/runtime.txt
scipy==1.13.1
scipy==1.15.1
# via
# -c envs/dev.env.txt
# -r deps/runtime.txt
Expand Down
4 changes: 2 additions & 2 deletions dev_tools/requirements/envs/mypy.env.txt
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ requests==2.32.3
# via
# -c envs/dev.env.txt
# -r deps/runtime.txt
scipy==1.13.1
scipy==1.15.1
# via
# -c envs/dev.env.txt
# -r deps/runtime.txt
Expand Down Expand Up @@ -153,7 +153,7 @@ types-networkx==3.4.2.20241227
# via
# -c envs/dev.env.txt
# -r deps/mypy.txt
types-pytz==2024.2.0.20241221
types-pytz==2025.1.0.20250204
# via
# -c envs/dev.env.txt
# pandas-stubs
Expand Down
2 changes: 1 addition & 1 deletion dev_tools/requirements/envs/pylint.env.txt
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ rpds-py==0.22.3
# -c envs/dev.env.txt
# jsonschema
# referencing
scipy==1.13.1
scipy==1.15.1
# via
# -c envs/dev.env.txt
# -r deps/runtime.txt
Expand Down
2 changes: 1 addition & 1 deletion dev_tools/requirements/envs/pytest-extra.env.txt
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ rpds-py==0.22.3
# -c envs/dev.env.txt
# jsonschema
# referencing
scipy==1.13.1
scipy==1.15.1
# via
# -c envs/dev.env.txt
# -r deps/runtime.txt
Expand Down
2 changes: 1 addition & 1 deletion dev_tools/requirements/envs/pytest.env.txt
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ rpds-py==0.22.3
# -c envs/dev.env.txt
# jsonschema
# referencing
scipy==1.13.1
scipy==1.15.1
# via
# -c envs/dev.env.txt
# -r deps/runtime.txt
Expand Down
49 changes: 21 additions & 28 deletions dev_tools/requirements/max_compat/dev.env.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --constraint=deps/oldest-versions.txt --output-file=max_compat/dev.env.txt deps/pytest.txt deps/runtime.txt
Expand All @@ -16,15 +16,15 @@ cirq-core==1.0.0
# via
# -c deps/oldest-versions.txt
# -r deps/runtime.txt
contourpy==1.1.1
contourpy==1.3.1
# via matplotlib
coverage[toml]==7.6.1
coverage[toml]==7.6.10
# via pytest-cov
cycler==0.12.1
# via matplotlib
deprecation==2.1.0
# via -r deps/runtime.txt
duet==0.2.8
duet==0.2.9
# via cirq-core
exceptiongroup==1.2.2
# via pytest
Expand All @@ -34,26 +34,21 @@ fastjsonschema==2.21.1
# via nbformat
fonttools==4.55.8
# via matplotlib
h5py==3.11.0
h5py==3.12.1
# via -r deps/runtime.txt
idna==3.10
# via requests
importlib-resources==6.4.5
# via
# jsonschema
# jsonschema-specifications
# matplotlib
iniconfig==2.0.0
# via pytest
jsonschema==4.23.0
# via nbformat
jsonschema-specifications==2023.12.1
jsonschema-specifications==2024.10.1
# via jsonschema
jupyter-core==5.7.2
# via nbformat
kiwisolver==1.4.7
kiwisolver==1.4.8
# via matplotlib
matplotlib==3.7.5
matplotlib==3.10.0
# via cirq-core
mpmath==1.3.0
# via sympy
Expand All @@ -63,7 +58,7 @@ networkx==2.8.8
# via
# -r deps/runtime.txt
# cirq-core
numpy==1.24.4
numpy==1.26.4
# via
# -r deps/runtime.txt
# cirq-core
Expand All @@ -77,29 +72,27 @@ packaging==24.2
# deprecation
# matplotlib
# pytest
pandas==2.0.3
pandas==2.2.3
# via cirq-core
pillow==10.4.0
pillow==11.1.0
# via matplotlib
pkgutil-resolve-name==1.3.10
# via jsonschema
platformdirs==4.3.6
# via jupyter-core
pluggy==1.5.0
# via pytest
pubchempy==1.0.4
# via -r deps/runtime.txt
pyparsing==3.1.4
pyparsing==3.2.1
# via matplotlib
pytest==8.3.4
# via
# -r deps/pytest.txt
# pytest-asyncio
# pytest-cov
# pytest-xdist
pytest-asyncio==0.24.0
pytest-asyncio==0.25.3
# via -r deps/pytest.txt
pytest-cov==5.0.0
pytest-cov==6.0.0
# via -r deps/pytest.txt
pytest-xdist==3.6.1
# via -r deps/pytest.txt
Expand All @@ -109,17 +102,17 @@ python-dateutil==2.9.0.post0
# pandas
pytz==2025.1
# via pandas
referencing==0.35.1
referencing==0.36.2
# via
# jsonschema
# jsonschema-specifications
requests==2.32.3
# via -r deps/runtime.txt
rpds-py==0.20.1
rpds-py==0.22.3
# via
# jsonschema
# referencing
scipy==1.10.1
scipy==1.15.1
# via
# -r deps/runtime.txt
# cirq-core
Expand All @@ -142,10 +135,10 @@ traitlets==5.14.3
# jupyter-core
# nbformat
typing-extensions==4.12.2
# via cirq-core
# via
# cirq-core
# referencing
tzdata==2025.1
# via pandas
urllib3==2.2.3
urllib3==2.3.0
# via requests
zipp==3.20.2
# via importlib-resources
51 changes: 19 additions & 32 deletions dev_tools/requirements/max_compat/pytest-max-compat.env.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --constraint=deps/oldest-versions.txt --constraint=max_compat/dev.env.txt --output-file=max_compat/pytest-max-compat.env.txt deps/pytest.txt deps/runtime.txt
Expand All @@ -22,11 +22,11 @@ cirq-core==1.0.0
# -c deps/oldest-versions.txt
# -c max_compat/dev.env.txt
# -r deps/runtime.txt
contourpy==1.1.1
contourpy==1.3.1
# via
# -c max_compat/dev.env.txt
# matplotlib
coverage[toml]==7.6.1
coverage[toml]==7.6.10
# via
# -c max_compat/dev.env.txt
# pytest-cov
Expand All @@ -38,7 +38,7 @@ deprecation==2.1.0
# via
# -c max_compat/dev.env.txt
# -r deps/runtime.txt
duet==0.2.8
duet==0.2.9
# via
# -c max_compat/dev.env.txt
# cirq-core
Expand All @@ -58,20 +58,14 @@ fonttools==4.55.8
# via
# -c max_compat/dev.env.txt
# matplotlib
h5py==3.11.0
h5py==3.12.1
# via
# -c max_compat/dev.env.txt
# -r deps/runtime.txt
idna==3.10
# via
# -c max_compat/dev.env.txt
# requests
importlib-resources==6.4.5
# via
# -c max_compat/dev.env.txt
# jsonschema
# jsonschema-specifications
# matplotlib
iniconfig==2.0.0
# via
# -c max_compat/dev.env.txt
Expand All @@ -80,19 +74,19 @@ jsonschema==4.23.0
# via
# -c max_compat/dev.env.txt
# nbformat
jsonschema-specifications==2023.12.1
jsonschema-specifications==2024.10.1
# via
# -c max_compat/dev.env.txt
# jsonschema
jupyter-core==5.7.2
# via
# -c max_compat/dev.env.txt
# nbformat
kiwisolver==1.4.7
kiwisolver==1.4.8
# via
# -c max_compat/dev.env.txt
# matplotlib
matplotlib==3.7.5
matplotlib==3.10.0
# via
# -c max_compat/dev.env.txt
# cirq-core
Expand All @@ -109,7 +103,7 @@ networkx==2.8.8
# -c max_compat/dev.env.txt
# -r deps/runtime.txt
# cirq-core
numpy==1.24.4
numpy==1.26.4
# via
# -c max_compat/dev.env.txt
# -r deps/runtime.txt
Expand All @@ -125,18 +119,14 @@ packaging==24.2
# deprecation
# matplotlib
# pytest
pandas==2.0.3
pandas==2.2.3
# via
# -c max_compat/dev.env.txt
# cirq-core
pillow==10.4.0
pillow==11.1.0
# via
# -c max_compat/dev.env.txt
# matplotlib
pkgutil-resolve-name==1.3.10
# via
# -c max_compat/dev.env.txt
# jsonschema
platformdirs==4.3.6
# via
# -c max_compat/dev.env.txt
Expand All @@ -149,7 +139,7 @@ pubchempy==1.0.4
# via
# -c max_compat/dev.env.txt
# -r deps/runtime.txt
pyparsing==3.1.4
pyparsing==3.2.1
# via
# -c max_compat/dev.env.txt
# matplotlib
Expand All @@ -160,11 +150,11 @@ pytest==8.3.4
# pytest-asyncio
# pytest-cov
# pytest-xdist
pytest-asyncio==0.24.0
pytest-asyncio==0.25.3
# via
# -c max_compat/dev.env.txt
# -r deps/pytest.txt
pytest-cov==5.0.0
pytest-cov==6.0.0
# via
# -c max_compat/dev.env.txt
# -r deps/pytest.txt
Expand All @@ -181,7 +171,7 @@ pytz==2025.1
# via
# -c max_compat/dev.env.txt
# pandas
referencing==0.35.1
referencing==0.36.2
# via
# -c max_compat/dev.env.txt
# jsonschema
Expand All @@ -190,12 +180,12 @@ requests==2.32.3
# via
# -c max_compat/dev.env.txt
# -r deps/runtime.txt
rpds-py==0.20.1
rpds-py==0.22.3
# via
# -c max_compat/dev.env.txt
# jsonschema
# referencing
scipy==1.10.1
scipy==1.15.1
# via
# -c max_compat/dev.env.txt
# -r deps/runtime.txt
Expand Down Expand Up @@ -231,15 +221,12 @@ typing-extensions==4.12.2
# via
# -c max_compat/dev.env.txt
# cirq-core
# referencing
tzdata==2025.1
# via
# -c max_compat/dev.env.txt
# pandas
urllib3==2.2.3
urllib3==2.3.0
# via
# -c max_compat/dev.env.txt
# requests
zipp==3.20.2
# via
# -c max_compat/dev.env.txt
# importlib-resources
2 changes: 1 addition & 1 deletion dev_tools/requirements/re-pip-compile-in-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ docker rm -v "$container_id"

# Do it again for `max_compat`.
# Set the docker build args; use a unique image name; use the correct output directory.
docker build -t openfermion-pip-compile-max-compat --build-arg='PYTHON_VERSION=3.8' --build-arg='PLATFORM=max_compat' "$SCRIPT_DIR"
docker build -t openfermion-pip-compile-max-compat --build-arg='PYTHON_VERSION=3.10' --build-arg='PLATFORM=max_compat' "$SCRIPT_DIR"
container_id=$(docker create openfermion-pip-compile-max-compat)
docker cp "$container_id:/pip-compile/max_compat" "$SCRIPT_DIR/"
docker rm -v "$container_id"