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

build: enhance dependency management and make scipy optional. #1215

Merged
merged 15 commits into from
Apr 12, 2023
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
9 changes: 5 additions & 4 deletions .github/workflows/daily-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ on:
- cron: '0 4 * * *'

## COMMENTED OUT: only for testing CI action changes
## pull_request:
## branches:
## - main
# pull_request:
# branches:
# - main
## END

jobs:
Expand All @@ -17,6 +17,7 @@ jobs:
python-version: ["3.8", "3.9", "3.10"]
tox-module-factor: ["cartesian", "eve", "next", "storage"]
os: ["ubuntu-latest"]
requirements-file: ["requirements-dev.txt", "min-requirements-test.txt", "min-extra-requirements-test.txt"]
fail-fast: false

runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -56,7 +57,6 @@ jobs:
run: |
pyversion=${{ matrix.python-version }}
pyversion_no_dot=${pyversion//./}
cp constraints.txt CURRENT-constraints.txt
tox run -e requirements-py${pyversion_no_dot}
# TODO(egparedes): add notification for dependencies updates
# - name: Check for updated requirements
Expand Down Expand Up @@ -102,6 +102,7 @@ jobs:
- name: Run tests
env:
NUM_PROCESSES: auto
ENV_REQUIREMENTS_FILE: ${{ matrix.requirements-file }}
run: |
tox run --skip-missing-interpreters -m test-${{ matrix.tox-module-factor }}-cpu
- name: Notify slack
Expand Down
25 changes: 11 additions & 14 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.1.0' # version from constraints.txt
rev: '23.3.0' # version from constraints.txt
##[[[end]]]
hooks:
- id: black
Expand Down Expand Up @@ -97,13 +97,13 @@ repos:
## print(f"- {pkg}==" + str(re.search(f'\n{pkg}==([0-9\.]*)', constraints)[1]))
##]]]
- darglint==1.8.1
- flake8-bugbear==23.2.13
- flake8-bugbear==23.3.12
- flake8-builtins==2.1.0
- flake8-debugger==4.1.2
- flake8-docstrings==1.7.0
- flake8-eradicate==1.4.0
- flake8-mutable==1.2.0
- flake8-pyproject==1.2.2
- flake8-pyproject==1.2.3
- pygments==2.14.0
##[[[end]]]
# - flake8-rst-docstrings # Disabled for now due to random false positives
Expand Down Expand Up @@ -139,9 +139,9 @@ repos:
## version = re.search('mypy==([0-9\.]*)', open("constraints.txt").read())[1]
## print(f"#========= FROM constraints.txt: v{version} =========")
##]]]
#========= FROM constraints.txt: v1.0.1 =========
#========= FROM constraints.txt: v1.1.1 =========
##[[[end]]]
rev: v1.0.1 # MUST match version ^^^^ in constraints.txt (if the mirror is up-to-date)
rev: v1.1.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 @@ -155,29 +155,26 @@ repos:
##]]]
- astunparse==1.6.3
- attrs==22.2.0
- black==23.1.0
- black==23.3.0
- boltons==23.0.0
- cached-property==1.5.2
- click==8.1.3
- cmake==3.25.2
- cmake==3.26.1
- cytoolz==0.12.1
- deepdiff==6.2.3
- deepdiff==6.3.0
- devtools==0.10.0
- frozendict==2.3.5
- frozendict==2.3.6
- gridtools-cpp==2.2.3
- importlib-resources==5.12.0
- jinja2==3.1.2
- lark==1.1.5
- mako==1.2.4
- networkx==3.0
- ninja==1.11.1
- numpy==1.24.2
- packaging==23.0
- pybind11==2.10.3
- scipy==1.10.1
- setuptools==67.5.1
- pybind11==2.10.4
- setuptools==67.6.1
- tabulate==0.9.0
- toolz==0.12.0
- typing-extensions==4.5.0
- xxhash==3.0.0
##[[[end]]]
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
![license](https://img.shields.io/github/license/GridTools/gt4py)
[![slack](https://img.shields.io/badge/slack-join-orange?logo=slack&labelColor=3a3a3a)](https://join.slack.com/t/gridtools/shared_invite/zt-1mceuj747-59swuowC3MKAuCFyNAnc1g)

[![Daily CI](https://github.com/GridTools/gt4py/actions/workflows/daily-ci.yml/badge.svg)](https://github.com/GridTools/gt4py/actions/workflows/daily-ci.yml)
![test-cartesian](https://github.com/GridTools/gt4py/actions/workflows/test-cartesian.yml/badge.svg?branch=main)
![test-next](https://github.com/GridTools/gt4py/actions/workflows/test-next.yml/badge.svg?branch=main)
![test-storage](https://github.com/GridTools/gt4py/actions/workflows/test-storage.yml/badge.svg?branch=main)
Expand Down
Loading