Fixes

GridTools · Feb 21, 2023 · 129baa6 · 129baa6
1 parent a98d4f9
commit 129baa6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/.github/workflows/daily-ci.yml b/.github/workflows/daily-ci.yml
@@ -4,9 +4,11 @@ on:
   schedule:
   - cron: '0 4 * * *'
 
+  ## COMMENTED OUT: only for testing CI action changes
   pull_request:
     branches:
     - main
+  ## END
 
 jobs:
   daily-ci:
@@ -48,23 +50,20 @@ jobs:
           **/requirements-dev.txt
     - name: Install tox
       run: |
-        python -m pip install -c ./constraints.txt pip setuptools wheel
-        python -m pip install -c ./constraints.txt tox
+        python -m pip install -c ./constraints.txt pip setuptools wheel tox
         python -m pip list
     - name: Update requirements
       run: |
         pyversion=${{ matrix.python-version }}
         pyversion_no_dot=${pyversion//./}
+        cp constraints.txt CURRENT-constraints.txt 
         tox run -e requirements-py${pyversion_no_dot}
     - name: Check for updated requirements
       id: update-requirements
       if: ${{ matrix.python-version == '3.8' && matrix.tox-module-factor == 'cartesian' }}
       shell: bash
       run: |
-        cp constraints.txt CURRENT-constraints.txt 
-        echo "blabla==1.2.3" >> CURRENT-constraints.txt
-        echo "REQS_DIFF=$(diff constraints.txt CURRENT-constraints.txt)"
-        echo "REQS_DIFF=$(diff constraints.txt CURRENT-constraints.txt)" >> $GITHUB_OUTPUT
+        echo "REQS_DIFF="$(diff --changed-group-format='%<' --unchanged-group-format='' constraints.txt CURRENT-constraints.txt)" | tr '\n' ' ' >> $GITHUB_OUTPUT
     - name: Notify updated requirements (if any)
       if: ${{ steps.update-requirements.outputs.REQS_DIFF }}
       env:
@@ -86,8 +85,8 @@ jobs:
               {
                 "type": "section",
                 "text": {
-                  "type": "mrkdwn",
-                  "text": "${{ env.REQS_DIFF }}"
+                  "type": "plain_text",
+                  "text": "Diff:\n${{ steps.update-requirements.outputs.REQS_DIFF }}"
                 }
               }
             ]

diff --git a/constraints.txt b/constraints.txt
@@ -30,7 +30,7 @@ cryptography==39.0.1      # via types-paramiko, types-pyopenssl, types-redis
 cytoolz==0.12.1           # via gt4py (pyproject.toml)
 dace==0.14.1              # via gt4py (pyproject.toml)
 darglint==1.8.1           # via -r requirements-dev.in
-deepdiff==6.2.3           # via gt4py (pyproject.toml)
+deepdiff==6.2.2           # via gt4py (pyproject.toml)
 devtools==0.10.0          # via -r requirements-dev.in, gt4py (pyproject.toml)
 dill==0.3.6               # via dace
 distlib==0.3.6            # via virtualenv
@@ -51,7 +51,7 @@ flake8-docstrings==1.7.0  # via -r requirements-dev.in
 flake8-eradicate==1.4.0   # via -r requirements-dev.in
 flake8-mutable==1.2.0     # via -r requirements-dev.in
 flake8-rst-docstrings==0.3.0  # via -r requirements-dev.in
-flask==2.2.2              # via dace
+flask==2.2.1              # via dace
 frozendict==2.3.4         # via gt4py (pyproject.toml)
 gridtools-cpp==2.2.3      # via gt4py (pyproject.toml)
 hypothesis==6.68.1        # via -r requirements-dev.in, gt4py (pyproject.toml)

diff --git a/tox.ini b/tox.ini
@@ -5,7 +5,7 @@ requires =
 envlist =
     eve-py{310}
     storage-py{310}-{internal,dace}-{cpu}
-    next-py{310}{-atlas,}
+    next-py{310}-{nomesh,atlas}
     cartesian-py{310}-{internal,dace}-{cpu}
     linters-py{310}
 #    docs
@@ -15,15 +15,15 @@ labels =
 
     test-eve-cpu = eve-py38, eve-py39, eve-py310
 
-    test-next-cpu = next-py310, next-py310-atlas
+    test-next-cpu = next-py310-nomesh, next-py310-atlas
 
     test-storage-cpu = storage-py38-internal-cpu, storage-py39-internal-cpu, storage-py310-internal-cpu, \
     storage-py38-dace-cpu, storage-py39-dace-cpu, storage-py310-dace-cpu
 
     test-cpu = cartesian-py38-internal-cpu, cartesian-py39-internal-cpu, cartesian-py310-internal-cpu, \
     cartesian-py38-dace-cpu, cartesian-py39-dace-cpu, cartesian-py310-dace-cpu, \
     eve-py38, eve-py39, eve-py310, \
-    next-py310, next-py310-atlas, \
+    next-py310-nomesh, next-py310-atlas, \
     storage-py38-internal-cpu, storage-py39-internal-cpu, storage-py310-internal-cpu, \
     storage-py38-dace-cpu, storage-py39-dace-cpu, storage-py310-dace-cpu
 
@@ -70,7 +70,7 @@ commands =
 ;    coverage json --rcfile=setup.cfg
 ;    coverage html --rcfile=setup.cfg --show-contexts
 
-[testenv:next-py{310}{-atlas,}]
+[testenv:next-py{310}-{nomesh,atlas}]
 description = Run 'gt4py.next' tests
 passenv = {[testenv]passenv}, BOOST_ROOT, BOOST_HOME, CUDA_HOME, CUDA_PATH
 deps =
@@ -79,7 +79,7 @@ deps =
 set_env =
     PIP_EXTRA_INDEX_URL = {env:PIP_EXTRA_INDEX_URL:https://test.pypi.org/simple/}
 commands =
-    !atlas: python -m pytest --cache-clear -v -n {env:NUM_PROCESSES:1} -m "not requires_atlas" {posargs} tests{/}next_tests
+    nomesh: python -m pytest --cache-clear -v -n {env:NUM_PROCESSES:1} -m "not requires_atlas" {posargs} tests{/}next_tests
     atlas: python -m pytest --cache-clear -v -n {env:NUM_PROCESSES:1} -m "requires_atlas" {posargs} tests{/}next_tests
     pytest --doctest-modules src{/}gt4py{/}next
 
@@ -131,7 +131,7 @@ commands =
 # commands_post =
 
 [testenv:requirements-py{38,39,310}]
-description = Update pinned development requirements
+description = Update pinned development requirements (*py38* should be used for freezing)
 deps =
     cogapp>=3.3
     pip-tools>=6.10
@@ -158,7 +158,7 @@ commands =
     --extra testing \
     -o requirements-dev.txt \
     pyproject.toml requirements-dev.in
-    py38: cog -r -P .pre-commit-config.yaml
+    cog -r -P .pre-commit-config.yaml
 
 [testenv:dev-py{38,39,310}{-atlas,}]
 description = Initialize development environment for gt4py