ci: enhance CI workflows and make them consistent (tox and GH actions)

.github/workflows/test-cartesian-fallback.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11"]
-        backends: [internal-cpu, dace-cpu]
+        tox-factor: [internal, dace]
 
     steps:
     - run: 'echo "No build required"'

.github/workflows/test-cartesian.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11"]
-        backends: [internal-cpu, dace-cpu]
+        tox-factor: [internal, dace]
     steps:
     - uses: actions/checkout@v2
     - name: Install boost
@@ -59,4 +59,4 @@ jobs:
       run: |
         pyversion=${{ matrix.python-version }}
         pyversion_no_dot=${pyversion//./}
-        tox run -e cartesian-py${pyversion_no_dot}-${{ matrix.backends }}
+        tox run -e cartesian-py${pyversion_no_dot}-${{ matrix.tox-factor }}-cpu

.github/workflows/test-next-fallback.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.10", "3.11"]
-        tox-env-factor: ["nomesh", "atlas"]
+        tox-factor: ["nomesh", "atlas"]
         os: ["ubuntu-latest"]
 
     runs-on: ${{ matrix.os }}

.github/workflows/test-next.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.10", "3.11"]
-        tox-env-factor: ["nomesh", "atlas"]
+        tox-factor: ["nomesh", "atlas"]
         os: ["ubuntu-latest"]
       fail-fast: false
 
@@ -59,7 +59,7 @@ jobs:
       run: |
         pyversion=${{ matrix.python-version }}
         pyversion_no_dot=${pyversion//./}
-        tox run -e next-py${pyversion_no_dot}-${{ matrix.tox-env-factor }}-cpu
+        tox run -e next-py${pyversion_no_dot}-${{ matrix.tox-factor }}-cpu
     #     mv coverage.json coverage-py${{ matrix.python-version }}-${{ matrix.os }}-${{ matrix.tox-env-factor }}-cpu.json
     # - name: Upload coverage.json artifact
     #   uses: actions/upload-artifact@v3

.github/workflows/test-storage-fallback.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11"]
-        backends: [internal-cpu, dace-cpu]
+        tox-factor: [internal, dace]
         os: ["ubuntu-latest"]
 
     runs-on: ${{ matrix.os }}

.github/workflows/test-storage.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11"]
-        backends: [internal-cpu, dace-cpu]
+        tox-factor: [internal, dace]
         os: ["ubuntu-latest"]
       fail-fast: false
 
@@ -51,7 +51,7 @@ jobs:
       run: |
         pyversion=${{ matrix.python-version }}
         pyversion_no_dot=${pyversion//./}
-        tox run -e storage-py${pyversion_no_dot}-${{ matrix.backends }}
+        tox run -e storage-py${pyversion_no_dot}-${{ matrix.tox-factor }}-cpu
     #     mv coverage.json coverage-py${{ matrix.python-version }}-${{ matrix.os }}.json
     # - name: Upload coverage.json artifact
     #   uses: actions/upload-artifact@v3

.pre-commit-config.yaml

@@ -15,6 +15,7 @@ repos:
   hooks:
   - id: pretty-format-ini
     args: [--autofix]
+    exclude: tox.ini
   - id: pretty-format-toml
     args: [--autofix]
   - id: pretty-format-yaml

tox.ini

@@ -5,30 +5,24 @@ requires =
 envlist =
     cartesian-py{310}-{internal,dace}-{cpu}
     eve-py{310}
-    next-py{310}-{nomesh,atlas}
+    next-py{310}-{nomesh,atlas}-{cpu}
     storage-py{310}-{internal,dace}-{cpu}
     linters-py{310}
-#    docs
+    # docs
 labels =
-    test-cartesian-cpu = cartesian-py38-internal-cpu, cartesian-py39-internal-cpu, cartesian-py310-internal-cpu, \
-    cartesian-py311-internal-cpu, cartesian-py38-dace-cpu, cartesian-py39-dace-cpu, cartesian-py310-dace-cpu, \
-    cartesian-py311-dace-cpu
-
+    test-cartesian-cpu = cartesian-py38-internal-cpu, cartesian-internal-py39-cpu, \
+        cartesian-internal-py310-cpu, cartesian-py311-internal-cpu, \
+        cartesian-py38-dace-cpu, cartesian-py39-dace-cpu, cartesian-py310-dace-cpu, cartesian-py311-dace-cpu
     test-eve-cpu = eve-py38, eve-py39, eve-py310, eve-py311
-
-    test-next-cpu = next-py310-nomesh, next-py311-nomesh, next-py310-atlas, next-py311-atlas
-
-    test-storage-cpu = storage-py38-internal-cpu, storage-py39-internal-cpu, storage-py310-internal-cpu, \
-    storage-py311-internal-cpu, storage-py38-dace-cpu, storage-py39-dace-cpu, storage-py310-dace-cpu, \
-    storage-py311-dace-cpu
-
-    test-cpu = cartesian-py38-internal-cpu, cartesian-py39-internal-cpu, cartesian-py310-internal-cpu, \
-    cartesian-py311-internal-cpu, cartesian-py38-dace-cpu, cartesian-py39-dace-cpu, cartesian-py310-dace-cpu, \
-    cartesian-py311-dace-cpu, \
-    eve-py38, eve-py39, eve-py310, eve-py311, \
-    next-py310-nomesh, next-py311-nomesh, next-py310-atlas, next-py311-atlas, \
-    storage-py38-internal-cpu, storage-py39-internal-cpu, storage-py310-internal-cpu, storage-py311-internal-cpu, \
-    storage-py38-dace-cpu, storage-py39-dace-cpu, storage-py310-dace-cpu, storage-py311-dace-cpu
+    test-next-cpu = next-py310-nomesh-cpu, next-py311-nomesh-cpu, next-py310-atlas-cpu, next-py311-atlas-cpu
+    test-storage-cpu = storage-py38-internal-cpu, storage-py39-internal-cpu, storage-py310-internal-cpu, storage-py311-internal-cpu, \
+        storage-py38-dace-cpu, storage-py39-dace-cpu, storage-py310-dace-cpu, storage-py311-dace-cpu
+    test-cpu = cartesian-py38-internal-cpu, cartesian-py39-internal-cpu, cartesian-py310-internal-cpu, cartesian-py311-internal-cpu, \
+        cartesian-py38-dace-cpu, cartesian-py39-dace-cpu, cartesian-py310-dace-cpu, cartesian-py311-dace-cpu, \
+        eve-py38, eve-py39, eve-py310, eve-py311, \
+        next-py310-nomesh-cpu, next-py311-nomesh-cpu, next-py310-atlas-cpu, next-py311-atlas-cpu, \
+        storage-py38-internal-cpu, storage-py39-internal-cpu, storage-py310-internal-cpu, storage-py311-internal-cpu, \
+        storage-py38-dace-cpu, storage-py39-dace-cpu, storage-py310-dace-cpu, storage-py311-dace-cpu
 
 [testenv]
 deps = -r {tox_root}{/}{env:ENV_REQUIREMENTS_FILE:requirements-dev.txt}
@@ -46,7 +40,7 @@ wheel_build_env = .pkg
 pass_env = CUDAARCHS, NUM_PROCESSES, GT4PY_*
 set_env =
     PYTEST_ADDOPTS = --color=auto --instafail
-    PYTHONWARNINGS = {env:PYTHONWARNINGS:ignore:Support for `[tool.setuptools]` in `pyproject.toml` is still *beta*:UserWarning,ignore:Field View Program ':UserWarning}
+    PYTHONWARNINGS = {env:PYTHONWARNINGS:ignore:Support for `[tool.setuptools]` in `pyproject.toml` is still *beta*:UserWarning,ignore:Field View Program:UserWarning}
 
 # -- Primary tests --
 [testenv:cartesian-py{38,39,310,311}-{internal,dace}-{cpu,cuda,cuda11x,cuda12x}]
@@ -59,16 +53,18 @@ allowlist_externals =
     ldd
     rm
 commands =
-    internal-cpu: python -m pytest --cache-clear -v -n {env:NUM_PROCESSES:1} -m "not requires_gpu and not requires_dace" {posargs} tests{/}cartesian_tests
-    internal-{cuda,cuda11x,cuda12x}: python -m pytest --cache-clear -v -n {env:NUM_PROCESSES:1} -m "requires_gpu and not requires_dace" {posargs} tests{/}cartesian_tests
-    dace-cpu: python -m pytest --cache-clear -v -n {env:NUM_PROCESSES:1} -m "not requires_gpu and requires_dace" {posargs} tests{/}cartesian_tests
-    dace-{cuda,cuda11x,cuda12x}: python -m pytest --cache-clear -v -n {env:NUM_PROCESSES:1} -m "requires_gpu and requires_dace" {posargs} tests{/}cartesian_tests
+    python -m pytest --cache-clear -v -n {env:NUM_PROCESSES:1} -m "\
+        internal: not requires_dace \
+        dace: requires_dace \
+        cpu: and not requires_gpu \
+        {cuda,cuda11x,cuda12x}: and requires_gpu \
+      " {posargs} tests{/}cartesian_tests
     python -m pytest --doctest-modules --doctest-ignore-import-errors src{/}gt4py{/}cartesian
 # commands_pre =
 #     rm -Rf tests/_reports/coverage*
-;commands_post =
-;    coverage json --rcfile=setup.cfg
-;    coverage html --rcfile=setup.cfg --show-contexts
+# commands_post =
+#     coverage json --rcfile=setup.cfg
+#     coverage html --rcfile=setup.cfg --show-contexts
 
 [testenv:eve-py{38,39,310,311}]
 description = Run 'gt4py.eve' tests
@@ -86,18 +82,22 @@ set_env =
     {[testenv]set_env}
     PIP_EXTRA_INDEX_URL = {env:PIP_EXTRA_INDEX_URL:https://test.pypi.org/simple/}
 commands =
-    nomesh-cpu: python -m pytest --cache-clear -v -n {env:NUM_PROCESSES:1} -m "not requires_atlas and not requires_gpu" {posargs} tests{/}next_tests
-    nomesh-{cuda,cuda11x,cuda12x}: python -m pytest --cache-clear -v -n {env:NUM_PROCESSES:1} -m "not requires_atlas and requires_gpu" {posargs} tests{/}next_tests
-    atlas-cpu: python -m pytest --cache-clear -v -n {env:NUM_PROCESSES:1} -m "requires_atlas and not requires_gpu" {posargs} tests{/}next_tests
-    # atlas-{cuda,cuda11x,cuda12x}: python -m pytest --cache-clear -v -n {env:NUM_PROCESSES:1} -m "requires_atlas and requires_gpu" {posargs} tests{/}next_tests   # TODO(ricoh): activate when such tests exist
+    python -m pytest --cache-clear -v -n {env:NUM_PROCESSES:1} -m "\
+        nomesh: not requires_atlas \
+        atlas: requires_atlas \
+        cpu: and not requires_gpu \
+        {cuda,cuda11x,cuda12x}: and requires_gpu \
+      " {posargs} tests{/}next_tests
     pytest --doctest-modules src{/}gt4py{/}next
 
 [testenv:storage-py{38,39,310,311}-{internal,dace}-{cpu,cuda,cuda11x,cuda12x}]
 description = Run 'gt4py.storage' tests
 commands =
-    cpu: python -m pytest --cache-clear -v -n {env:NUM_PROCESSES:1} -m "not requires_gpu" {posargs} tests{/}storage_tests
-    {cuda,cuda11x,cuda12x}: python -m pytest --cache-clear -v -n {env:NUM_PROCESSES:1} -m "requires_gpu" {posargs} tests{/}storage_tests
-    #pytest doctest-modules {posargs} src{/}gt4py{/}storage
+    python -m pytest --cache-clear -v -n {env:NUM_PROCESSES:1} -m "\
+        cpu: not requires_gpu \
+        {cuda,cuda11x,cuda12x}: requires_gpu \
+      " {posargs} tests{/}storage_tests
+    # pytest doctest-modules {posargs} src{/}gt4py{/}storage
 
 # -- Secondary tests --
 [testenv:linters-py{38,39,310,311}]