Skip to content

Commit

Permalink
build[cartesian][next]: Bump dace version from 0.14.4 to 0.15.1 (#1391)
Browse files Browse the repository at this point in the history
Bumping dace version to 0.15.1 affects both cartesian and next gt4py:
 * cartesian: removed try/except for dace backward compatibility
 * next: re-enabled some tests that were broken on dace 0.14.4
 * all: fixed and/or suppressed flake8 and mypy errors
  • Loading branch information
edopao authored Jan 19, 2024
1 parent 49db7ef commit b900b47
Show file tree
Hide file tree
Showing 19 changed files with 262 additions and 292 deletions.
38 changes: 19 additions & 19 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ repos:
## version = re.search('black==([0-9\.]*)', open("constraints.txt").read())[1]
## print(f"rev: '{version}' # version from constraints.txt")
##]]]
rev: '23.9.1' # version from constraints.txt
rev: '23.11.0' # version from constraints.txt
##[[[end]]]
hooks:
- id: black
Expand All @@ -73,7 +73,7 @@ repos:
## version = re.search('isort==([0-9\.]*)', open("constraints.txt").read())[1]
## print(f"rev: '{version}' # version from constraints.txt")
##]]]
rev: '5.12.0' # version from constraints.txt
rev: '5.13.0' # version from constraints.txt
##[[[end]]]
hooks:
- id: isort
Expand All @@ -97,14 +97,14 @@ repos:
## print(f"- {pkg}==" + str(re.search(f'\n{pkg}==([0-9\.]*)', constraints)[1]))
##]]]
- darglint==1.8.1
- flake8-bugbear==23.9.16
- flake8-builtins==2.1.0
- flake8-bugbear==23.12.2
- flake8-builtins==2.2.0
- flake8-debugger==4.1.2
- flake8-docstrings==1.7.0
- flake8-eradicate==1.5.0
- flake8-mutable==1.2.0
- flake8-pyproject==1.2.3
- pygments==2.16.1
- pygments==2.17.2
##[[[end]]]
# - flake8-rst-docstrings # Disabled for now due to random false positives
exclude: |
Expand Down Expand Up @@ -146,9 +146,9 @@ repos:
## version = re.search('mypy==([0-9\.]*)', open("constraints.txt").read())[1]
## print(f"#========= FROM constraints.txt: v{version} =========")
##]]]
#========= FROM constraints.txt: v1.5.1 =========
#========= FROM constraints.txt: v1.7.1 =========
##[[[end]]]
rev: v1.5.1 # MUST match version ^^^^ in constraints.txt (if the mirror is up-to-date)
rev: v1.7.1 # MUST match version ^^^^ in constraints.txt (if the mirror is up-to-date)
hooks:
- id: mypy
additional_dependencies: # versions from constraints.txt
Expand All @@ -162,26 +162,26 @@ repos:
##]]]
- astunparse==1.6.3
- attrs==23.1.0
- black==23.9.1
- boltons==23.0.0
- black==23.11.0
- boltons==23.1.1
- cached-property==1.5.2
- click==8.1.7
- cmake==3.27.5
- cmake==3.27.9
- cytoolz==0.12.2
- deepdiff==6.5.0
- deepdiff==6.7.1
- devtools==0.12.2
- frozendict==2.3.8
- frozendict==2.3.10
- gridtools-cpp==2.3.1
- importlib-resources==6.0.1
- importlib-resources==6.1.1
- jinja2==3.1.2
- lark==1.1.7
- mako==1.2.4
- nanobind==1.5.2
- ninja==1.11.1
- lark==1.1.8
- mako==1.3.0
- nanobind==1.8.0
- ninja==1.11.1.1
- numpy==1.24.4
- packaging==23.1
- packaging==23.2
- pybind11==2.11.1
- setuptools==68.2.2
- setuptools==69.0.2
- tabulate==0.9.0
- typing-extensions==4.5.0
- xxhash==3.0.0
Expand Down
191 changes: 102 additions & 89 deletions constraints.txt

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions min-extra-requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cmake==3.22
cogapp==3.3
coverage[toml]==5.0
cytoolz==0.12.0
dace==0.14.2
dace==0.15.1
darglint==1.6
deepdiff==5.6.0
devtools==0.6
Expand Down Expand Up @@ -70,7 +70,7 @@ scipy==1.7.2
setuptools==65.5.0
sphinx==4.4
sphinx_rtd_theme==1.0
sympy==1.7
sympy==1.9
tabulate==0.8.10
tomli==2.0.1
tox==3.2.0
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ requires-python = '>=3.8'
cuda = ['cupy>=12.0']
cuda11x = ['cupy-cuda11x>=12.0']
cuda12x = ['cupy-cuda12x>=12.0']
dace = ['dace>=0.14.2,<0.15', 'sympy>=1.7']
dace = ['dace>=0.15.1,<0.16', 'sympy>=1.9']
formatting = ['clang-format>=9.0']
# Always add all extra packages to 'full' for a simple full gt4py installation
full = [
'clang-format>=9.0',
'dace>=0.14.2,<0.15',
'dace>=0.15.1,<0.16',
'hypothesis>=6.0.0',
'pytest>=7.0',
'sympy>=1.7',
'sympy>=1.9',
'scipy>=1.7.2',
'jax[cpu]>=0.4.13'
]
Expand Down
Loading

0 comments on commit b900b47

Please sign in to comment.