Skip to content

Commit

Permalink
Merge branch 'main' into optimize_program
Browse files Browse the repository at this point in the history
  • Loading branch information
SF-N authored Nov 4, 2024
2 parents 2bf3d11 + 162a512 commit f3dd7ab
Show file tree
Hide file tree
Showing 15 changed files with 304 additions and 171 deletions.
24 changes: 12 additions & 12 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ repos:
## version = re.search('ruff==([0-9\.]*)', open("constraints.txt").read())[1]
## print(f"rev: v{version}")
##]]]
rev: v0.6.4
rev: v0.7.2
##[[[end]]]
hooks:
# Run the linter.
Expand All @@ -73,9 +73,9 @@ repos:
## version = re.search('mypy==([0-9\.]*)', open("constraints.txt").read())[1]
## print(f"#========= FROM constraints.txt: v{version} =========")
##]]]
#========= FROM constraints.txt: v1.11.2 =========
#========= FROM constraints.txt: v1.13.0 =========
##[[[end]]]
rev: v1.11.2 # MUST match version ^^^^ in constraints.txt (if the mirror is up-to-date)
rev: v1.13.0 # MUST match version ^^^^ in constraints.txt (if the mirror is up-to-date)
hooks:
- id: mypy
additional_dependencies: # versions from constraints.txt
Expand All @@ -95,25 +95,25 @@ repos:
- attrs==24.2.0
- black==24.8.0
- boltons==24.0.0
- cached-property==1.5.2
- cached-property==2.0.1
- click==8.1.7
- cmake==3.30.3
- cytoolz==0.12.3
- cmake==3.30.5
- cytoolz==1.0.0
- deepdiff==8.0.1
- devtools==0.12.2
- factory-boy==3.3.1
- frozendict==2.4.4
- gridtools-cpp==2.3.4
- frozendict==2.4.6
- gridtools-cpp==2.3.6
- importlib-resources==6.4.5
- jinja2==3.1.4
- lark==1.2.2
- mako==1.3.5
- nanobind==2.1.0
- mako==1.3.6
- nanobind==2.2.0
- ninja==1.11.1.1
- numpy==1.24.4
- packaging==24.1
- pybind11==2.13.5
- setuptools==74.1.2
- pybind11==2.13.6
- setuptools==75.3.0
- tabulate==0.9.0
- typing-extensions==4.12.2
- xxhash==3.0.0
Expand Down
97 changes: 48 additions & 49 deletions constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,51 +14,50 @@ babel==2.16.0 # via sphinx
backcall==0.2.0 # via ipython
black==24.8.0 # via gt4py (pyproject.toml)
boltons==24.0.0 # via gt4py (pyproject.toml)
bracex==2.5 # via wcmatch
build==1.2.2 # via pip-tools
bump-my-version==0.26.0 # via -r requirements-dev.in
cached-property==1.5.2 # via gt4py (pyproject.toml)
bracex==2.5.post1 # via wcmatch
build==1.2.2.post1 # via pip-tools
bump-my-version==0.28.0 # via -r requirements-dev.in
cached-property==2.0.1 # via gt4py (pyproject.toml)
cachetools==5.5.0 # via tox
certifi==2024.8.30 # via requests
cfgv==3.4.0 # via pre-commit
chardet==5.2.0 # via tox
charset-normalizer==3.3.2 # via requests
clang-format==18.1.8 # via -r requirements-dev.in, gt4py (pyproject.toml)
charset-normalizer==3.4.0 # via requests
clang-format==19.1.3 # via -r requirements-dev.in, gt4py (pyproject.toml)
click==8.1.7 # via black, bump-my-version, gt4py (pyproject.toml), pip-tools, rich-click
cmake==3.30.3 # via gt4py (pyproject.toml)
cmake==3.30.5 # via gt4py (pyproject.toml)
cogapp==3.4.1 # via -r requirements-dev.in
colorama==0.4.6 # via tox
comm==0.2.2 # via ipykernel
contourpy==1.1.1 # via matplotlib
coverage==7.6.1 # via -r requirements-dev.in, pytest-cov
cycler==0.12.1 # via matplotlib
cytoolz==0.12.3 # via gt4py (pyproject.toml)
cytoolz==1.0.0 # via gt4py (pyproject.toml)
dace==0.16.1 # via gt4py (pyproject.toml)
darglint==1.8.1 # via -r requirements-dev.in
debugpy==1.8.5 # via ipykernel
debugpy==1.8.7 # via ipykernel
decorator==5.1.1 # via ipython
deepdiff==8.0.1 # via gt4py (pyproject.toml)
devtools==0.12.2 # via gt4py (pyproject.toml)
dill==0.3.8 # via dace
distlib==0.3.8 # via virtualenv
dill==0.3.9 # via dace
distlib==0.3.9 # via virtualenv
docutils==0.20.1 # via sphinx, sphinx-rtd-theme
eval-type-backport==0.2.0 # via tach
exceptiongroup==1.2.2 # via hypothesis, pytest
execnet==2.1.1 # via pytest-cache, pytest-xdist
executing==2.1.0 # via devtools, stack-data
factory-boy==3.3.1 # via gt4py (pyproject.toml), pytest-factoryboy
faker==28.4.1 # via factory-boy
faker==30.8.2 # via factory-boy
fastjsonschema==2.20.0 # via nbformat
filelock==3.16.0 # via tox, virtualenv
fonttools==4.53.1 # via matplotlib
filelock==3.16.1 # via tox, virtualenv
fonttools==4.54.1 # via matplotlib
fparser==0.1.4 # via dace
frozendict==2.4.4 # via gt4py (pyproject.toml)
frozendict==2.4.6 # via gt4py (pyproject.toml)
gitdb==4.0.11 # via gitpython
gitpython==3.1.43 # via tach
gridtools-cpp==2.3.4 # via gt4py (pyproject.toml)
hypothesis==6.112.0 # via -r requirements-dev.in, gt4py (pyproject.toml)
identify==2.6.0 # via pre-commit
idna==3.8 # via requests
gridtools-cpp==2.3.6 # via gt4py (pyproject.toml)
hypothesis==6.113.0 # via -r requirements-dev.in, gt4py (pyproject.toml)
identify==2.6.1 # via pre-commit
idna==3.10 # via requests
imagesize==1.4.1 # via sphinx
importlib-metadata==8.5.0 # via build, jupyter-client, sphinx
importlib-resources==6.4.5 ; python_version < "3.9" # via gt4py (pyproject.toml), jsonschema, jsonschema-specifications, matplotlib
Expand All @@ -70,22 +69,22 @@ jedi==0.19.1 # via ipython
jinja2==3.1.4 # via dace, gt4py (pyproject.toml), sphinx
jsonschema==4.23.0 # via nbformat
jsonschema-specifications==2023.12.1 # via jsonschema
jupyter-client==8.6.2 # via ipykernel, nbclient
jupyter-client==8.6.3 # via ipykernel, nbclient
jupyter-core==5.7.2 # via ipykernel, jupyter-client, nbformat
jupytext==1.16.4 # via -r requirements-dev.in
kiwisolver==1.4.7 # via matplotlib
lark==1.2.2 # via gt4py (pyproject.toml)
mako==1.3.5 # via gt4py (pyproject.toml)
mako==1.3.6 # via gt4py (pyproject.toml)
markdown-it-py==3.0.0 # via jupytext, mdit-py-plugins, rich
markupsafe==2.1.5 # via jinja2, mako
matplotlib==3.7.5 # via -r requirements-dev.in
matplotlib-inline==0.1.7 # via ipykernel, ipython
mdit-py-plugins==0.4.2 # via jupytext
mdurl==0.1.2 # via markdown-it-py
mpmath==1.3.0 # via sympy
mypy==1.11.2 # via -r requirements-dev.in
mypy==1.13.0 # via -r requirements-dev.in
mypy-extensions==1.0.0 # via black, mypy
nanobind==2.1.0 # via gt4py (pyproject.toml)
nanobind==2.2.0 # via gt4py (pyproject.toml)
nbclient==0.6.8 # via nbmake
nbformat==5.10.4 # via jupytext, nbclient, nbmake
nbmake==1.5.4 # via -r requirements-dev.in
Expand All @@ -102,25 +101,25 @@ pexpect==4.9.0 # via ipython
pickleshare==0.7.5 # via ipython
pillow==10.4.0 # via matplotlib
pip-tools==7.4.1 # via -r requirements-dev.in
pipdeptree==2.23.3 # via -r requirements-dev.in
pipdeptree==2.23.4 # via -r requirements-dev.in
pkgutil-resolve-name==1.3.10 # via jsonschema
platformdirs==4.3.2 # via black, jupyter-core, tox, virtualenv
platformdirs==4.3.6 # via black, jupyter-core, tox, virtualenv
pluggy==1.5.0 # via pytest, tox
ply==3.11 # via dace
pre-commit==3.5.0 # via -r requirements-dev.in
prompt-toolkit==3.0.36 # via ipython, questionary, tach
psutil==6.0.0 # via -r requirements-dev.in, ipykernel, pytest-xdist
psutil==6.1.0 # via -r requirements-dev.in, ipykernel, pytest-xdist
ptyprocess==0.7.0 # via pexpect
pure-eval==0.2.3 # via stack-data
pybind11==2.13.5 # via gt4py (pyproject.toml)
pydantic==2.9.1 # via bump-my-version, pydantic-settings, tach
pydantic-core==2.23.3 # via pydantic
pydantic-settings==2.5.2 # via bump-my-version
pydot==2.0.0 # via tach
pybind11==2.13.6 # via gt4py (pyproject.toml)
pydantic==2.9.2 # via bump-my-version, pydantic-settings
pydantic-core==2.23.4 # via pydantic
pydantic-settings==2.6.1 # via bump-my-version
pydot==3.0.2 # via tach
pygments==2.18.0 # via -r requirements-dev.in, devtools, ipython, nbmake, rich, sphinx
pyparsing==3.1.4 # via matplotlib, pydot
pyproject-api==1.7.1 # via tox
pyproject-hooks==1.1.0 # via build, pip-tools
pyproject-api==1.8.0 # via tox
pyproject-hooks==1.2.0 # via build, pip-tools
pytest==8.3.3 # via -r requirements-dev.in, gt4py (pyproject.toml), nbmake, pytest-cache, pytest-cov, pytest-custom-exit-code, pytest-factoryboy, pytest-instafail, pytest-xdist
pytest-cache==1.0 # via -r requirements-dev.in
pytest-cov==5.0.0 # via -r requirements-dev.in
Expand All @@ -136,18 +135,18 @@ pyzmq==26.2.0 # via ipykernel, jupyter-client
questionary==2.0.1 # via bump-my-version
referencing==0.35.1 # via jsonschema, jsonschema-specifications
requests==2.32.3 # via sphinx
rich==13.8.1 # via bump-my-version, rich-click, tach
rich==13.9.3 # via bump-my-version, rich-click, tach
rich-click==1.8.3 # via bump-my-version
rpds-py==0.20.0 # via jsonschema, referencing
ruff==0.6.4 # via -r requirements-dev.in
rpds-py==0.20.1 # via jsonschema, referencing
ruff==0.7.2 # via -r requirements-dev.in
scipy==1.10.1 # via gt4py (pyproject.toml)
setuptools-scm==8.1.0 # via fparser
six==1.16.0 # via asttokens, astunparse, python-dateutil
smmap==5.0.1 # via gitdb
snowballstemmer==2.2.0 # via sphinx
sortedcontainers==2.4.0 # via hypothesis
sphinx==7.1.2 # via -r requirements-dev.in, sphinx-rtd-theme, sphinxcontrib-jquery
sphinx-rtd-theme==2.0.0 # via -r requirements-dev.in
sphinx-rtd-theme==3.0.1 # via -r requirements-dev.in
sphinxcontrib-applehelp==1.0.4 # via sphinx
sphinxcontrib-devhelp==1.0.2 # via sphinx
sphinxcontrib-htmlhelp==2.0.1 # via sphinx
Expand All @@ -159,25 +158,25 @@ stack-data==0.6.3 # via ipython
stdlib-list==0.10.0 # via tach
sympy==1.12.1 # via dace, gt4py (pyproject.toml)
tabulate==0.9.0 # via gt4py (pyproject.toml)
tach==0.10.7 # via -r requirements-dev.in
tomli==2.0.1 ; python_version < "3.11" # via -r requirements-dev.in, black, build, coverage, jupytext, mypy, pip-tools, pyproject-api, pytest, setuptools-scm, tox
tach==0.14.1 # via -r requirements-dev.in
tomli==2.0.2 ; python_version < "3.11" # via -r requirements-dev.in, black, build, coverage, jupytext, mypy, pip-tools, pyproject-api, pytest, setuptools-scm, tach, tox
tomli-w==1.0.0 # via tach
tomlkit==0.13.2 # via bump-my-version
toolz==0.12.1 # via cytoolz
toolz==1.0.0 # via cytoolz
tornado==6.4.1 # via ipykernel, jupyter-client
tox==4.18.1 # via -r requirements-dev.in
tox==4.23.2 # via -r requirements-dev.in
traitlets==5.14.3 # via comm, ipykernel, ipython, jupyter-client, jupyter-core, matplotlib-inline, nbclient, nbformat
types-tabulate==0.9.0.20240106 # via -r requirements-dev.in
typing-extensions==4.12.2 # via annotated-types, black, gt4py (pyproject.toml), ipython, mypy, pydantic, pydantic-core, pytest-factoryboy, rich, rich-click, setuptools-scm
typing-extensions==4.12.2 # via annotated-types, black, faker, gt4py (pyproject.toml), ipython, mypy, pydantic, pydantic-core, pytest-factoryboy, rich, rich-click, setuptools-scm, tox
urllib3==2.2.3 # via requests
virtualenv==20.26.4 # via pre-commit, tox
wcmatch==9.0 # via bump-my-version
virtualenv==20.27.1 # via pre-commit, tox
wcmatch==10.0 # via bump-my-version
wcwidth==0.2.13 # via prompt-toolkit
websockets==13.0.1 # via dace
websockets==13.1 # via dace
wheel==0.44.0 # via astunparse, pip-tools
xxhash==3.0.0 # via gt4py (pyproject.toml)
zipp==3.20.1 # via importlib-metadata, importlib-resources
zipp==3.20.2 # via importlib-metadata, importlib-resources

# The following packages are considered to be unsafe in a requirements file:
pip==24.2 # via pip-tools, pipdeptree
setuptools==74.1.2 # via gt4py (pyproject.toml), pip-tools, setuptools-scm
pip==24.3.1 # via pip-tools, pipdeptree
setuptools==75.3.0 # via gt4py (pyproject.toml), pip-tools, setuptools-scm
2 changes: 1 addition & 1 deletion min-extra-requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ deepdiff==5.6.0
devtools==0.6
factory-boy==3.3.0
frozendict==2.3
gridtools-cpp==2.3.4
gridtools-cpp==2.3.6
hypothesis==6.0.0
importlib-resources==5.0; python_version < "3.9"
jax[cpu]==0.4.18; python_version >= "3.10"
Expand Down
2 changes: 1 addition & 1 deletion min-requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ deepdiff==5.6.0
devtools==0.6
factory-boy==3.3.0
frozendict==2.3
gridtools-cpp==2.3.4
gridtools-cpp==2.3.6
hypothesis==6.0.0
importlib-resources==5.0; python_version < "3.9"
jinja2==3.0.0
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies = [
'diskcache>=5.6.3',
'factory-boy>=3.3.0',
'frozendict>=2.3',
'gridtools-cpp>=2.3.4,==2.*',
'gridtools-cpp>=2.3.6,==2.*',
"importlib-resources>=5.0;python_version<'3.9'",
'jinja2>=3.0.0',
'lark>=1.1.2',
Expand Down
Loading

0 comments on commit f3dd7ab

Please sign in to comment.