Fix dependencies (importlib_metadata and scipy)

fluiddyn · Jan 10, 2024 · 131beae · 131beae
1 parent 096a329
commit 131beae
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 71 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -177,7 +177,7 @@ test-release:examples:
     - . .venv/bin/activate
     - pip install fluidfft
     - pip install lib
-    - pip install ".[mpi,fft,scipy,test]"
+    - pip install ".[mpi,fft,test]"
     - cd doc/examples
     - make tests
     - make tests_mpi

diff --git a/fluidsim/_version.py b/fluidsim/_version.py
@@ -1,6 +1,6 @@
-import importlib_metadata
+from importlib import metadata
 
-__version__ = importlib_metadata.version(__package__)
+__version__ = metadata.version(__package__)
 
 
 __all__ = ["__version__", "get_local_version", "__about__"]

diff --git a/lib/pyproject.toml b/lib/pyproject.toml
@@ -10,6 +10,7 @@ authors = [
 ]
 dependencies = [
      "fluiddyn",
+     "importlib_metadata; python_version < '3.10'",
 ]
 dynamic = ['version', 'description']
 

diff --git a/noxfile.py b/noxfile.py
@@ -12,7 +12,7 @@ def validate_code(session):
 
 @nox.session
 def test_without_fft_and_pythran(session):
-    command = "pdm install -G dev -G test -G mpi -G scipy --no-self"
+    command = "pdm install -G dev -G test -G mpi --no-self"
     session.run_always(*command.split(), external=True)
     session.install(".", "--config-settings=setup-args=-Dtransonic-backend=python", "--no-deps")
     session.run(
@@ -28,7 +28,7 @@ def test_with_fft_and_pythran(session):
     # first install fluidfft without Pythran compilation
     session.install("fluidfft", env={"FLUIDFFT_TRANSONIC_BACKEND": "python"})
 
-    command = "pdm install -G dev -G test -G fft -G mpi -G scipy --no-self"
+    command = "pdm install -G dev -G test -G fft -G mpi --no-self"
     session.run_always(*command.split(), external=True)
     session.install(".", "--no-deps")
 

diff --git a/pdm.lock b/pdm.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -20,7 +20,6 @@ authors = [
 version = '0.7.4'
 requires-python = ">=3.9"
 dependencies = [
-    "importlib_metadata",
     "fluidsim-core>=0.7.4",
     "h5py",
     "h5netcdf",
@@ -75,7 +74,6 @@ test = [
     "ipython",
     "pymech",
 ]
-scipy = ["scipy"]
 
 [project.scripts]
 fluidsim = "fluidsim.util.console.__main__:run"
@@ -150,7 +148,6 @@ doc = [
     "numpydoc",
     "jupyter",
     "pandas",
-    "scipy",
     "ipynbname",
     "myst-nb",
     "sphinx-copybutton",