Update .gitlab-ci.yml file

Author: fracape

.github/workflows/pytest.yml

@@ -21,7 +21,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
 
     - name: Install the project
-      run: uv sync --locked --all-extras --dev
+      run: uv sync --reinstall --locked --all-extras --dev
 
     - name: Run unit tests
       run: uv run pytest -m "not slow" --cov=compressai -s tests/

.gitlab-ci.yml

@@ -156,7 +156,7 @@ test:
       update_dict(base, delta)
       Path("pyproject.toml").write_text(tomlkit.dumps(base))
       EOF
-    - uv sync --group=test
+    - uv sync --group=test --reinstall
     - *check-torch-cuda
     - |
       PYTEST_ARGS=(--cov=compressai --capture=no tests)

pyproject.toml

@@ -31,8 +31,7 @@ classifiers = [
 dependencies = [
   "einops",
   "matplotlib",
-  "numpy >= 1.24.4,<2.0; python_version < '3.10'",
-  "numpy >= 2.2.4; python_version >= '3.10'",
+  "numpy >= 1.24.4,<2.0",
   "Pandas >= 2.0; python_version < '3.10'",
   "Pandas >= 2.2.0; python_version >= '3.10'",
   "pybind11>=2.6.0; python_version < '3.10'", # For --no-build-isolation.

setup.py

@@ -40,6 +40,22 @@
     import tomli as tomllib
 
 
+from packaging.version import parse as parse_version
+
+try:
+    import torch
+
+    torch_version = parse_version(torch.__version__)
+except ImportError:
+    torch_version = parse_version("0.0")
+
+# Logic to determine numpy version based on torch version
+if torch_version < parse_version("2.2"):
+    numpy_req = "numpy<2"
+else:
+    numpy_req = "numpy>=2.0"
+
+
 with open("pyproject.toml", "rb") as f:
     pyproject = tomllib.load(f)
 
@@ -106,4 +122,7 @@ def find_sources(path):
     name=package_name,
     ext_modules=get_extensions(),
     cmdclass={"build_ext": build_ext},
+    install_requires=[
+        numpy_req,
+    ],
 )