public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #48824 from timokau/cypari2-update

Browse Source 
pythonPackages.cypari2: 1.2.1 -> 1.3.1
This commit is contained in:
Timo Kaufmann 2018-10-22 15:08:53 +02:00 committed by GitHub
commit c4650da128
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
View File

@ -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> From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 21 Oct 2018 17:52:40 +0200 Date: Sun, 21 Oct 2018 17:52:40 +0200
Subject: [PATCH] Only test py2/py3 optional tests when all of sage is tested Subject: [PATCH] Only test py2/py3 optional tests when all of sage is tested
--- ---
src/sage/doctest/control.py | 3 ++- src/sage/doctest/control.py | 5 +++--
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py 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 --- a/src/sage/doctest/control.py
+++ b/src/sage/doctest/control.py +++ b/src/sage/doctest/control.py
@@ -362,7 +362,8 @@ class DocTestController(SageObject): @@ -362,7 +362,8 @@ class DocTestController(SageObject):
@ -21,6 +21,15 @@ index bf18df8b2b..b04af0e2e8 100644
self.options = options 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 2.18.1

5
pkgs/development/python-modules/cypari2/default.nix
View File

@ -11,11 +11,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cypari2"; 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 { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0v2kikwf0advq8j76nwzhlacwj1yys9cvajm4fqgmasjdsnf1q4k"; sha256 = "04f00xp8aaz37v00iqg1mv5wjq00a5qhk8cqa93s13009s9x984r";
}; };
# This differs slightly from the default python installPhase in that it pip-installs # This differs slightly from the default python installPhase in that it pip-installs