Merge commit '13af6c6b8c1533ba9d1b45b127e1a7b7d30000c6' of git://trac.sagemath.org/sage into t/28745/environment_yaml

Matthias Koeppe · Matthias Koeppe · commit 45b3408883e8 · 2020-11-22T18:20:26.000-08:00
diff --git a/build/pkgs/certifi/checksums.ini b/build/pkgs/certifi/checksums.ini
@@ -1,5 +1,5 @@
 tarball=certifi-VERSION.tar.gz
-sha1=4bb6fad4f43f262f61d306581d9e29c91ff1d1e2
-md5=89525ece725d674d91b0c43007d2a47e
-cksum=4236975362
+sha1=dde31a44f2c2e36f007f6cd97ebec5a15070b1bb
+md5=b25267355218d11652c707e46accd059
+cksum=3624975010
 upstream_url=https://pypi.io/packages/source/c/certifi/certifi-VERSION.tar.gz
diff --git a/build/pkgs/certifi/package-version.txt b/build/pkgs/certifi/package-version.txt
@@ -1 +1 @@
-2020.6.20
+2020.11.8
diff --git a/build/pkgs/cffi/checksums.ini b/build/pkgs/cffi/checksums.ini
@@ -1,5 +1,5 @@
 tarball=cffi-VERSION.tar.gz
-sha1=2a8f05a7d51d77ef1e641cb359a54e4d8fa019cb
-md5=74845f8d2b7b583dd9a3574f402edf39
-cksum=1594930691
+sha1=7199374653c1927e8d3c523b6498b149acdb6f7e
+md5=c2a47ffd5d183b193ac8ed3414dcfd07
+cksum=311874377
 upstream_url=https://pypi.io/packages/source/c/cffi/cffi-VERSION.tar.gz
diff --git a/build/pkgs/cffi/package-version.txt b/build/pkgs/cffi/package-version.txt
@@ -1 +1 @@
-1.14.0
+1.14.3
diff --git a/build/pkgs/decorator/checksums.ini b/build/pkgs/decorator/checksums.ini
@@ -1,4 +1,4 @@
 tarball=decorator-VERSION.tar.gz
-sha1=de59d002bcf83b16421e6ea6fe40256b5fccedad
-md5=a565a98581c0d110bc247323e89df9b1
-cksum=2873659364
+sha1=24d4560ff3e89a6cec068d323383577343c086fb
+md5=d83c624cce93e6bdfab144821b526e1d
+cksum=1324765948
diff --git a/build/pkgs/decorator/package-version.txt b/build/pkgs/decorator/package-version.txt
@@ -1 +1 @@
-4.4.0
+4.4.2
diff --git a/build/pkgs/fpylll/checksums.ini b/build/pkgs/fpylll/checksums.ini
@@ -1,4 +1,4 @@
 tarball=fpylll-VERSION.tar.gz
-sha1=2d35022ac75457606d7e5d3497f6d9dd75deb19c
-md5=1c0d100203cb340cb3160ab9692f9208
-cksum=1547949297
+sha1=b1f2d6eae30ce083c4282384049989fe45bd33cd
+md5=95ad1823e15031f12603c8f38acb1477
+cksum=2108756831
diff --git a/build/pkgs/fpylll/package-version.txt b/build/pkgs/fpylll/package-version.txt
@@ -1 +1 @@
-0.5.1dev
+0.5.2dev
diff --git a/build/pkgs/markupsafe/checksums.ini b/build/pkgs/markupsafe/checksums.ini
@@ -1,4 +1,4 @@
 tarball=markupsafe-VERSION.tar.gz
-sha1=ec0079f4d4fbdc92b6fd4720fa04933350044ad5
-md5=49e3f3230cedb7ae34faf06913db83fc
-cksum=1060771740
+sha1=f70e5fd3c120a1b108d4347ea1115e3962c42026
+md5=43fd756864fe42063068e092e220c57b
+cksum=310980784
diff --git a/build/pkgs/markupsafe/package-version.txt b/build/pkgs/markupsafe/package-version.txt
@@ -1 +1 @@
-1.1.0
+1.1.1
diff --git a/build/pkgs/matplotlib/checksums.ini b/build/pkgs/matplotlib/checksums.ini
@@ -1,5 +1,5 @@
 tarball=matplotlib-VERSION.tar.gz
-sha1=2564563937720572f940d14e7718c36c974e9462
-md5=f3a405f340be5b151cb2042c4d8d16f7
-cksum=2092155023
+sha1=2d280ae73b2d7a269edbc2ba2304fb4d0fcff765
+md5=a85791908e78818bd425ba9ab38500fa
+cksum=636107635
 upstream_url=https://pypi.io/packages/source/m/matplotlib/matplotlib-VERSION.tar.gz
diff --git a/build/pkgs/matplotlib/package-version.txt b/build/pkgs/matplotlib/package-version.txt
@@ -1 +1 @@
-3.3.1
+3.3.2
diff --git a/build/pkgs/networkx/checksums.ini b/build/pkgs/networkx/checksums.ini
@@ -1,5 +1,5 @@
-tarball=networkx-VERSION.zip
-sha1=b440621c1f597b6dff46c1150541a48601a180cc
-md5=95617052af8998381ff3bc9c88ffeaa3
-cksum=2271648010
-upstream_url=https://github.com/networkx/networkx/archive/networkx-2.4.zip
+tarball=networkx-VERSION.tar.gz
+sha1=439af030cbfdc2c4cbdef5dc423d5ea8e527d02a
+md5=21f25be1f4373e19153a9beca63346e7
+cksum=1531245694
+upstream_url=https://pypi.io/packages/source/n/networkx/networkx-VERSION.tar.gz
diff --git a/build/pkgs/networkx/package-version.txt b/build/pkgs/networkx/package-version.txt
@@ -1 +1 @@
-2.4
+2.5
diff --git a/build/pkgs/numpy/checksums.ini b/build/pkgs/numpy/checksums.ini
@@ -1,5 +1,5 @@
 tarball=numpy-VERSION.zip
-sha1=0d6b62fbf723f5d91ab289766a252a30467609f1
-md5=2ccca1881b2766040149629614d22a3f
-cksum=3596367842
+sha1=9b000c77efc890b8267354c51120ca2b07adde1d
+md5=d40f6fcf611ab40eed4ff90606e05307
+cksum=869452740
 upstream_url=https://pypi.io/packages/source/n/numpy/numpy-VERSION.zip
diff --git a/build/pkgs/numpy/package-version.txt b/build/pkgs/numpy/package-version.txt
@@ -1 +1 @@
-1.19.1
+1.19.4
diff --git a/build/pkgs/packaging/checksums.ini b/build/pkgs/packaging/checksums.ini
@@ -1,4 +1,4 @@
 tarball=packaging-VERSION.tar.gz
-sha1=8a64f2b9c411b7275ba1c10ceadbd01b6779d21d
-md5=b066f2a33524519cf4e97ab69f462479
-cksum=1955944718
+sha1=b99fa7af153646722b2d1817bb09906cc5a94bc6
+md5=3208229da731c5d8e29d4d8941e75005
+cksum=1742055469
diff --git a/build/pkgs/packaging/package-version.txt b/build/pkgs/packaging/package-version.txt
@@ -1 +1 @@
-18.0
+20.4
diff --git a/build/pkgs/pathpy/SPKG.rst b/build/pkgs/pathpy/SPKG.rst
diff --git a/build/pkgs/pathpy/checksums.ini b/build/pkgs/pathpy/checksums.ini
diff --git a/build/pkgs/pathpy/dependencies b/build/pkgs/pathpy/dependencies
diff --git a/build/pkgs/pathpy/package-version.txt b/build/pkgs/pathpy/package-version.txt
diff --git a/build/pkgs/pathpy/spkg-install.in b/build/pkgs/pathpy/spkg-install.in
diff --git a/build/pkgs/pathpy/type b/build/pkgs/pathpy/type
diff --git a/build/pkgs/pickleshare/dependencies b/build/pkgs/pickleshare/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) pathpy | $(PYTHON_TOOLCHAIN)
+$(PYTHON) | $(PYTHON_TOOLCHAIN)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/pyparsing/checksums.ini b/build/pkgs/pyparsing/checksums.ini
@@ -1,4 +1,4 @@
 tarball=pyparsing-VERSION.tar.gz
-sha1=4c1668f50cf50feff838c1d2172ac034d42ff824
-md5=f855a0a8d0259b36fac1fa6581f401ef
-cksum=274928572
+sha1=ca8d892c93fe2d54ea5e6f31c5798e40c58e8667
+md5=f0953e47a0112f7a65aec2305ffdf7b4
+cksum=2411150047
diff --git a/build/pkgs/pyparsing/package-version.txt b/build/pkgs/pyparsing/package-version.txt
@@ -1 +1 @@
-2.3.0
+2.4.7
diff --git a/build/pkgs/pytz/checksums.ini b/build/pkgs/pytz/checksums.ini
@@ -1,5 +1,5 @@
 tarball=pytz-VERSION.tar.gz
-sha1=60f6db35e92688c4701c16bd3d2b9cbfac1fd604
-md5=0349106ac02f2bfe565dd6d5594e3a15
-cksum=1599443821
+sha1=7b6b52156e0c532e9e500665a2c720397765bd64
+md5=1f8f29656c8219171ff9a3c5b72fb30a
+cksum=3106815315
 upstream_url=https://pypi.io/packages/source/p/pytz/pytz-VERSION.tar.gz
diff --git a/build/pkgs/pytz/package-version.txt b/build/pkgs/pytz/package-version.txt
@@ -1 +1 @@
-2020.1
+2020.4
diff --git a/build/pkgs/rpy2/checksums.ini b/build/pkgs/rpy2/checksums.ini
@@ -1,5 +1,5 @@
 tarball=rpy2-VERSION.tar.gz
-sha1=af1c7ffe900233ac5add5195f106299bd72fd575
-md5=8a5db07798763b9c6672b5f80451b944
-cksum=828149660
+sha1=6436fc9bfc3118d6551c0e2a06d9ec2eb389c28a
+md5=fd789967d3e46744cb1b2c4e55f47839
+cksum=906818309
 upstream_url=https://pypi.io/packages/source/r/rpy2/rpy2-VERSION.tar.gz
diff --git a/build/pkgs/rpy2/package-version.txt b/build/pkgs/rpy2/package-version.txt
@@ -1 +1 @@
-3.3.5
+3.3.6
diff --git a/build/pkgs/scipy/checksums.ini b/build/pkgs/scipy/checksums.ini
@@ -1,5 +1,5 @@
 tarball=scipy-VERSION.tar.gz
-sha1=d921aa98f73ea5bc533536df7fa681df52d8b9e2
-md5=620fc39f371e04a76af5d0290f8d3753
-cksum=1914434501
+sha1=ffbc97517d08d8a5b290c7a5dd6cda0c730ed531
+md5=293401ee7ac354a2f2313373b497f40e
+cksum=3851762650
 upstream_url=https://pypi.io/packages/source/s/scipy/scipy-VERSION.tar.gz
diff --git a/build/pkgs/scipy/package-version.txt b/build/pkgs/scipy/package-version.txt
@@ -1 +1 @@
-1.5.2
+1.5.4
diff --git a/build/pkgs/scipy/patches/extern_decls.patch b/build/pkgs/scipy/patches/extern_decls.patch
diff --git a/src/doc/en/developer/packaging.rst b/src/doc/en/developer/packaging.rst
@@ -140,8 +140,7 @@ Third-party packages in Sage consist of two parts:
    project name contains characters which are not alphanumeric
    and are not an underscore, those characters should be removed
    or replaced by an underscore. For example, the project
-   ``FFLAS-FFPACK`` is called ``fflas_ffpack`` in Sage and ``path.py``
-   is renamed ``pathpy`` in Sage.
+   ``FFLAS-FFPACK`` is called ``fflas_ffpack`` in Sage.
 
 As an example, let us consider a hypothetical FoO project. They
 (upstream) distribute a tarball ``FoO-1.3.tar.gz`` (that will be
diff --git a/tox.ini b/tox.ini
@@ -439,9 +439,9 @@ commands =
     docker:            if [ x"{env:DOCKER_PUSH_REPOSITORY:}" != x ]; then echo Pushing $BUILD_TAG; docker push $BUILD_TAG || echo "(ignoring errors)"; fi; \
     docker:            if [ $status != 0 ]; then exit $status; fi; \
     docker:        done'
-    # pathpy checksuite needs tox. #28728: gap fails its test suite.
+    # #28728: gap fails its test suite.
     # linbox/cysignals testsuites fail.  ppl takes very long.
-    local:         bash -c 'export PATH={env:PATH} && {env:SETENV} && {env:BOOTSTRAP} && ./configure --prefix={envdir}/local {env:CONFIGURE_ARGS} && make -k V=0 base-toolchain && make -k V=0 SAGE_SPKG="sage-spkg -y -o" SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!r,!python3,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!symengine_py" {env:TARGETS_PRE:} {posargs:build} && (make -k V=0 SAGE_SPKG="sage-spkg -y -o" SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!r,!python3,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake" {env:TARGETS_OPTIONAL:} || echo "(error ignored)" ) '
+    local:         bash -c 'export PATH={env:PATH} && {env:SETENV} && {env:BOOTSTRAP} && ./configure --prefix={envdir}/local {env:CONFIGURE_ARGS} && make -k V=0 base-toolchain && make -k V=0 SAGE_SPKG="sage-spkg -y -o" SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!r,!python3,!nose,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!symengine_py" {env:TARGETS_PRE:} {posargs:build} && (make -k V=0 SAGE_SPKG="sage-spkg -y -o" SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!r,!python3,!nose,!gap,!cysignals,!linbox,!git,!ppl,!cmake" {env:TARGETS_OPTIONAL:} || echo "(error ignored)" ) '
 
 [testenv:check_configure]
 ## Test that configure behaves properly
