diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2018-10-22 15:08:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-22 15:08:53 +0200 |
| commit | c4650da12819a9c30c5e6601f7920ab7e949ff39 (patch) | |
| tree | e6646d271ee9259fb8ca4d574eb9bc5e831fafe6 | |
| parent | 119d539d7242394184ee2b9823571d8f67c55eef (diff) | |
| parent | 9512841e89e298e40815eea7779973c7905f7a1f (diff) | |
| download | nixpkgs-c4650da12819a9c30c5e6601f7920ab7e949ff39.tar nixpkgs-c4650da12819a9c30c5e6601f7920ab7e949ff39.tar.gz nixpkgs-c4650da12819a9c30c5e6601f7920ab7e949ff39.tar.bz2 nixpkgs-c4650da12819a9c30c5e6601f7920ab7e949ff39.tar.lz nixpkgs-c4650da12819a9c30c5e6601f7920ab7e949ff39.tar.xz nixpkgs-c4650da12819a9c30c5e6601f7920ab7e949ff39.tar.zst nixpkgs-c4650da12819a9c30c5e6601f7920ab7e949ff39.zip | |
Merge pull request #48824 from timokau/cypari2-update
pythonPackages.cypari2: 1.2.1 -> 1.3.1
| -rw-r--r-- | pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch | 17 | ||||
| -rw-r--r-- | pkgs/development/python-modules/cypari2/default.nix | 5 |
2 files changed, 16 insertions, 6 deletions
diff --git a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch b/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch index 2a7dc13756d..8cd80281d0e 100644 --- a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch +++ b/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch @@ -1,14 +1,14 @@ -From c8edfefbbec87ca776d3cf84ee895aac200dda40 Mon Sep 17 00:00:00 2001 +From 8218bd4fdeb4c92de8af0d3aabec55980fc4fb3d Mon Sep 17 00:00:00 2001 From: Timo Kaufmann <timokau@zoho.com> Date: Sun, 21 Oct 2018 17:52:40 +0200 Subject: [PATCH] Only test py2/py3 optional tests when all of sage is tested --- - src/sage/doctest/control.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + src/sage/doctest/control.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py -index bf18df8b2b..b04af0e2e8 100644 +index bf18df8b2b..935c67abf7 100644 --- a/src/sage/doctest/control.py +++ b/src/sage/doctest/control.py @@ -362,7 +362,8 @@ class DocTestController(SageObject): @@ -21,6 +21,15 @@ index bf18df8b2b..b04af0e2e8 100644 self.options = options +@@ -765,7 +766,7 @@ class DocTestController(SageObject): + sage: DC = DocTestController(DD, [dirname]) + sage: DC.expand_files_into_sources() + sage: sorted(DC.sources[0].options.optional) # abs tol 1 +- ['guava', 'magma', 'py2'] ++ ['guava', 'magma'] + + We check that files are skipped appropriately:: + -- 2.18.1 diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index 6df19e4c94b..a77e98dae4c 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -11,11 +11,12 @@ buildPythonPackage rec { pname = "cypari2"; - version = "1.2.1"; + # upgrade may break sage, please test the sage build or ping @timokau on upgrade + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0v2kikwf0advq8j76nwzhlacwj1yys9cvajm4fqgmasjdsnf1q4k"; + sha256 = "04f00xp8aaz37v00iqg1mv5wjq00a5qhk8cqa93s13009s9x984r"; }; # This differs slightly from the default python installPhase in that it pip-installs |