Merge pull request #56781 from timokau/sage-python-upgrade-fixes
Sage python upgrade fixes
This commit is contained in:
commit
37182b20a6
|
@ -0,0 +1,22 @@
|
||||||
|
diff --git a/src/sage/misc/package.py b/src/sage/misc/package.py
|
||||||
|
index 689e5a23b9..4e16fe3a8d 100644
|
||||||
|
--- a/src/sage/misc/package.py
|
||||||
|
+++ b/src/sage/misc/package.py
|
||||||
|
@@ -142,9 +142,14 @@ def pip_installed_packages():
|
||||||
|
sage: d['beautifulsoup'] # optional - beautifulsoup
|
||||||
|
u'...'
|
||||||
|
"""
|
||||||
|
- proc = subprocess.Popen(["pip", "list", "--no-index", "--format", "json"], stdout=subprocess.PIPE)
|
||||||
|
- stdout = proc.communicate()[0].decode()
|
||||||
|
- return {package['name'].lower():package['version'] for package in json.loads(stdout)}
|
||||||
|
+ with open(os.devnull, 'w') as devnull:
|
||||||
|
+ proc = subprocess.Popen(
|
||||||
|
+ ["pip", "list", "--no-index", "--format", "json"],
|
||||||
|
+ stdout=subprocess.PIPE,
|
||||||
|
+ stderr=devnull,
|
||||||
|
+ )
|
||||||
|
+ stdout = proc.communicate()[0].decode()
|
||||||
|
+ return {package['name'].lower():package['version'] for package in json.loads(stdout)}
|
||||||
|
|
||||||
|
def list_packages(*pkg_types, **opts):
|
||||||
|
r"""
|
|
@ -112,6 +112,9 @@ stdenv.mkDerivation rec {
|
||||||
url = "https://git.sagemath.org/sage.git/patch?id=a05b6b038e1571ab15464e98f76d1927c0c3fd12";
|
url = "https://git.sagemath.org/sage.git/patch?id=a05b6b038e1571ab15464e98f76d1927c0c3fd12";
|
||||||
sha256 = "05yq97pq84xi60wb1p9skrad5h5x770gq98ll4frr7hvvmlwsf58";
|
sha256 = "05yq97pq84xi60wb1p9skrad5h5x770gq98ll4frr7hvvmlwsf58";
|
||||||
})
|
})
|
||||||
|
|
||||||
|
# https://trac.sagemath.org/ticket/27405
|
||||||
|
./patches/ignore-pip-deprecation.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = nixPatches ++ packageUpgradePatches;
|
patches = nixPatches ++ packageUpgradePatches;
|
||||||
|
|
|
@ -65,11 +65,13 @@ buildPythonPackage rec {
|
||||||
perl
|
perl
|
||||||
jupyter_core
|
jupyter_core
|
||||||
pkg-config
|
pkg-config
|
||||||
|
pip # needed to query installed packages
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gd
|
gd
|
||||||
readline
|
readline
|
||||||
|
iml
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -58,6 +58,10 @@ buildPythonPackage rec {
|
||||||
tidyr
|
tidyr
|
||||||
]) ++ extraRPackages ++ rWrapper.recommendedPackages;
|
]) ++ extraRPackages ++ rWrapper.recommendedPackages;
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
R # needed at setup time to detect R_HOME (alternatively set R_HOME explicitly)
|
||||||
|
];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# R_LIBS_SITE is used by the nix r package to point to the installed R libraries.
|
# R_LIBS_SITE is used by the nix r package to point to the installed R libraries.
|
||||||
# This patch sets R_LIBS_SITE when rpy2 is imported.
|
# This patch sets R_LIBS_SITE when rpy2 is imported.
|
||||||
|
|
Loading…
Reference in a new issue