Merge pull request #1664 from l0b0/last-matplotlib-3-7-release

nix-community · May 25, 2024 · 9126f1b · 9126f1b
2 parents cd4e2b3 + f4d2486
commit 9126f1b
Show file tree

Hide file tree

Showing 8 changed files with 517 additions and 449 deletions.
diff --git a/tests/default.nix b/tests/default.nix
@@ -129,7 +129,7 @@ in
   missing-iswheel = callTest ./missing-iswheel { };
   wheel-wheel = callTest ./wheel-wheel { };
   fancycompleter-wheel = callTest ./fancycompleter-wheel { };
-  matplotlib-post-3-7 = callTest ./matplotlib-post-3-7 { };
+  matplotlib-3-7 = callTest ./matplotlib-3-7 { };
   rfc3986-validator = callTest ./rfc3986-validator { };
   virtualenv-pre-20-18 = callTest ./virtualenv-pre-20-18 { };
   virtualenv-post-20-18 = callTest ./virtualenv-post-20-18 { };
@@ -181,7 +181,7 @@ in
   # linux-only API (AIO)
   aiopath = callTest ./aiopath { };
   # doesn't compile on darwin
-  matplotlib-pre-3-7 = callTest ./matplotlib-pre-3-7 { };
+  matplotlib-3-6 = callTest ./matplotlib-3-6 { };
   # the version of scipy used here doesn't build from source on darwin
   scipy1_9 = callTest ./scipy1_9 { };
 } // lib.optionalAttrs (!stdenv.isAarch64) {

diff --git a/tests/matplotlib-pre-3-7/default.nix → tests/matplotlib-3-6/default.nix b/tests/matplotlib-pre-3-7/default.nix → tests/matplotlib-3-6/default.nix
@@ -4,7 +4,7 @@ let
     projectDir = ./.;
   };
 in
-runCommand "matplotlib-pre-3-7-test" { } ''
+runCommand "matplotlib-3-6-test" { } ''
   ${env}/bin/python -c 'import matplotlib'
   touch $out
 ''
diff --git a/tests/matplotlib-pre-3-7/poetry.lock → tests/matplotlib-3-6/poetry.lock b/tests/matplotlib-pre-3-7/poetry.lock → tests/matplotlib-3-6/poetry.lock
diff --git a/tests/matplotlib-pre-3-7/pyproject.toml → tests/matplotlib-3-6/pyproject.toml b/tests/matplotlib-pre-3-7/pyproject.toml → tests/matplotlib-3-6/pyproject.toml
@@ -1,5 +1,5 @@
 [tool.poetry]
-name = "matplotlib-pre-3-7"
+name = "matplotlib-3-6"
 version = "0.1.0"
 description = ""
 authors = ["Your Name <you@example.com>"]

diff --git a/tests/matplotlib-post-3-7/default.nix → tests/matplotlib-3-7/default.nix b/tests/matplotlib-post-3-7/default.nix → tests/matplotlib-3-7/default.nix
@@ -4,7 +4,7 @@ let
     projectDir = ./.;
   };
 in
-runCommand "matplotlib-post-3-7-test" { } ''
+runCommand "matplotlib-3-7-test" { } ''
   ${env}/bin/python -c 'import matplotlib'
   touch $out
 ''
diff --git a/tests/matplotlib-3-7/poetry.lock b/tests/matplotlib-3-7/poetry.lock
diff --git a/tests/matplotlib-post-3-7/pyproject.toml → tests/matplotlib-3-7/pyproject.toml b/tests/matplotlib-post-3-7/pyproject.toml → tests/matplotlib-3-7/pyproject.toml
@@ -1,12 +1,12 @@
 [tool.poetry]
-name = "matplotlib-post-3-7"
+name = "matplotlib-3-7"
 version = "0.1.0"
 description = ""
 authors = ["Your Name <you@example.com>"]
 
 [tool.poetry.dependencies]
 python = "^3.10"
-matplotlib = "*"
+matplotlib = "~3.7"
 
 [build-system]
 requires = ["poetry-core>=1.1"]

diff --git a/tests/matplotlib-post-3-7/poetry.lock b/tests/matplotlib-post-3-7/poetry.lock