Refactor tox.ini and bump numpy

Author: egparedes

constraints.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    "tox run -e requirements-common"
+#    "tox run -e requirements-base"
 #
 aenum==3.1.15             # via dace
 alabaster==0.7.13         # via sphinx
@@ -47,7 +47,7 @@ exceptiongroup==1.2.0     # via hypothesis, pytest
 execnet==2.0.2            # via pytest-cache, pytest-xdist
 executing==2.0.1          # via devtools, stack-data
 factory-boy==3.3.0        # via -r requirements-dev.in, pytest-factoryboy
-faker==22.6.0             # via factory-boy
+faker==22.7.0             # via factory-boy
 fastjsonschema==2.19.1    # via nbformat
 filelock==3.13.1          # via tox, virtualenv
 flake8==7.0.0             # via -r requirements-dev.in, flake8-bugbear, flake8-builtins, flake8-debugger, flake8-docstrings, flake8-eradicate, flake8-mutable, flake8-pyproject, flake8-rst-docstrings

docs/development/tools/requirements.md

@@ -18,10 +18,10 @@ The expected workflow to update GT4Py requirements is as follows:
 
 2. For changes in the development tools, update the `requirements-dev.in` file.
 
-3. Run the **tox** _requirements-common_ environment to update all files automatically with **pip-compile** and **cog**. Note that **pip-compile** will most likely update the versions of some unrelated tools if new versions are available in PyPI.
+3. Run the **tox** _requirements-base_ environment to update all files automatically with **pip-compile** and **cog**. Note that **pip-compile** will most likely update the versions of some unrelated tools if new versions are available in PyPI.
 
    ```bash
-   tox r -e requirements-common
+   tox r -e requirements-base
    ```
 
 4. Check that the **mypy** mirror used by **pre-commit** (https://github.com/pre-commit/mirrors-mypy) in `.pre-commit-config.yaml` supports the same version as in `constraints.txt`, and manually update the `rev` version number.

min-extra-requirements-test.txt

@@ -89,7 +89,7 @@ mypy==1.0
 nanobind==1.4.0
 nbmake==1.4.6
 ninja==1.10
-numpy==1.21.2
+numpy==1.22.0
 packaging==20.0
 pip-tools==6.10
 pipdeptree==2.3

min-requirements-test.txt

@@ -84,7 +84,7 @@ mypy==1.0
 nanobind==1.4.0
 nbmake==1.4.6
 ninja==1.10
-numpy==1.21.2
+numpy==1.22.0
 packaging==20.0
 pip-tools==6.10
 pipdeptree==2.3

pyproject.toml

@@ -42,7 +42,7 @@ dependencies = [
   'mako>=1.1',
   'nanobind>=1.4.0 ',
   'ninja>=1.10',
-  'numpy>=1.21.2',
+  'numpy>=1.22.0',
   'packaging>=20.0',
   'pybind11>=2.5',
   'setuptools>=65.5.0',

requirements-dev.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    "tox run -e requirements-common"
+#    "tox run -e requirements-base"
 #
 aenum==3.1.15             # via -c constraints.txt, dace
 alabaster==0.7.13         # via -c constraints.txt, sphinx
@@ -47,7 +47,7 @@ exceptiongroup==1.2.0     # via -c constraints.txt, hypothesis, pytest
 execnet==2.0.2            # via -c constraints.txt, pytest-cache, pytest-xdist
 executing==2.0.1          # via -c constraints.txt, devtools, stack-data
 factory-boy==3.3.0        # via -c constraints.txt, -r requirements-dev.in, pytest-factoryboy
-faker==22.6.0             # via -c constraints.txt, factory-boy
+faker==22.7.0             # via -c constraints.txt, factory-boy
 fastjsonschema==2.19.1    # via -c constraints.txt, nbformat
 filelock==3.13.1          # via -c constraints.txt, tox, virtualenv
 flake8==7.0.0             # via -c constraints.txt, -r requirements-dev.in, flake8-bugbear, flake8-builtins, flake8-debugger, flake8-docstrings, flake8-eradicate, flake8-mutable, flake8-pyproject, flake8-rst-docstrings

tox.ini

@@ -3,10 +3,10 @@ requires =
     tox>=4.2
     virtualenv>20.2
 envlist =
+    cartesian-py{310}-{internal,dace}-{cpu}
     eve-py{310}
-    storage-py{310}-{internal,dace}-{cpu}
     next-py{310}-{nomesh,atlas}
-    cartesian-py{310}-{internal,dace}-{cpu}
+    storage-py{310}-{internal,dace}-{cpu}
     linters-py{310}
 #    docs
 labels =
@@ -47,6 +47,7 @@ pass_env = NUM_PROCESSES
 set_env =
     PYTHONWARNINGS = {env:PYTHONWARNINGS:ignore:Support for `[tool.setuptools]` in `pyproject.toml` is still *beta*:UserWarning}
 
+# -- Primary tests --
 [testenv:cartesian-py{38,39,310,311}-{internal,dace}-{cpu,cuda,cuda11x,cuda12x}]
 description = Run 'gt4py.cartesian' tests
 pass_env = {[testenv]pass_env}, BOOST_ROOT, BOOST_HOME, CUDA_HOME, CUDA_PATH, CXX, CC, OPENMP_CPPFLAGS, OPENMP_LDFLAGS, PIP_USER, PYTHONUSERBASE
@@ -97,16 +98,28 @@ commands =
     {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
 
-[testenv:notebooks-py{310,311}]
-description = Run notebooks
-commands = python -m pytest --nbmake examples -v -n {env:NUM_PROCESSES:1}
-
+# -- Secondary tests --
 [testenv:linters-py{38,39,310,311}]
 description = Run linters
 commands =
     flake8 .{/}src
     mypy .{/}src
 
+[testenv:notebooks-py{310,311}]
+description = Run notebooks
+commands = python -m pytest --nbmake examples -v -n {env:NUM_PROCESSES:1}
+
+# -- Other artefacts --
+[testenv:dev-py{38,39,310,311}{-atlas,}]
+description = Initialize development environment for gt4py
+deps =
+    -r {tox_root}{/}requirements-dev.txt
+    atlas: atlas4py
+package = editable-legacy  # => use_develop = True
+set_env =
+    {[testenv]set_env}
+    PIP_EXTRA_INDEX_URL = {env:PIP_EXTRA_INDEX_URL:https://test.pypi.org/simple/}
+
 # [testenv:docs]
 # usedevelop = true
 # commands_pre =
@@ -135,15 +148,15 @@ commands =
 #     git add _static
 # commands_post =
 
-[testenv:requirements-{common,py38,py39,py310,py311}]
+[testenv:requirements-{base,py38,py39,py310,py311}]
 description =
-    common: Update pinned development requirements
+    base: Update pinned development requirements
     py38: Update requirements for testing a specific python version
     py39: Update requirements for testing a specific python version
     py310: Update requirements for testing a specific python version
     py311: Update requirements for testing a specific python version
 base_python =
-    common: py38
+    base: py38
     py38: py38
     py39: py39
     py310: py310
@@ -154,7 +167,7 @@ deps =
     pip-tools>=6.10
 package = skip
 set_env =
-    CUSTOM_COMPILE_COMMAND = "tox run -e requirements-common"
+    CUSTOM_COMPILE_COMMAND = "tox run -e requirements-base"
 allowlist_externals =
     mv
 commands =
@@ -191,13 +204,3 @@ commands =
     pyproject.toml requirements-dev.in
     # Run cog to update .pre-commit-config.yaml with new versions
     common: cog -r -P .pre-commit-config.yaml
-
-[testenv:dev-py{38,39,310,311}{-atlas,}]
-description = Initialize development environment for gt4py
-deps =
-    -r {tox_root}{/}requirements-dev.txt
-    atlas: atlas4py
-package = editable-legacy  # => use_develop = True
-set_env =
-    {[testenv]set_env}
-    PIP_EXTRA_INDEX_URL = {env:PIP_EXTRA_INDEX_URL:https://test.pypi.org/simple/}