Merge #30416

Matthias Koeppe · Matthias Koeppe · commit 1fbb18c7841f · 2021-05-27T16:28:56.000-07:00
diff --git a/build/pkgs/appdirs/SPKG.rst b/build/pkgs/appdirs/SPKG.rst
@@ -0,0 +1,18 @@
+appdirs: A small Python module for determining appropriate platform-specific dirs, e.g. a "user data dir".
+==========================================================================================================
+
+Description
+-----------
+
+A small Python module for determining appropriate platform-specific dirs, e.g. a "user data dir".
+
+License
+-------
+
+MIT
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/appdirs/
+
diff --git a/build/pkgs/appdirs/checksums.ini b/build/pkgs/appdirs/checksums.ini
@@ -0,0 +1,5 @@
+tarball=appdirs-VERSION.tar.gz
+sha1=1fa04e44b1084338cb7b21e9cf44fce5efb81840
+md5=d6bca12613174185dd9abc8a29f4f012
+cksum=1191718163
+upstream_url=https://pypi.io/packages/source/a/appdirs/appdirs-VERSION.tar.gz
diff --git a/build/pkgs/appdirs/dependencies b/build/pkgs/appdirs/dependencies
@@ -0,0 +1,4 @@
+$(PYTHON) | $(PYTHON_TOOLCHAIN)
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/appdirs/install-requires.txt b/build/pkgs/appdirs/install-requires.txt
@@ -0,0 +1 @@
+appdirs
diff --git a/build/pkgs/appdirs/package-version.txt b/build/pkgs/appdirs/package-version.txt
@@ -0,0 +1 @@
+1.4.4
diff --git a/build/pkgs/appdirs/spkg-install.in b/build/pkgs/appdirs/spkg-install.in
@@ -0,0 +1,2 @@
+cd src
+sdh_pip_install .
diff --git a/build/pkgs/appdirs/type b/build/pkgs/appdirs/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/distlib/SPKG.rst b/build/pkgs/distlib/SPKG.rst
@@ -0,0 +1,18 @@
+distlib: Distribution utilities
+===============================
+
+Description
+-----------
+
+Distribution utilities
+
+License
+-------
+
+Python license
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/distlib/
+
diff --git a/build/pkgs/distlib/checksums.ini b/build/pkgs/distlib/checksums.ini
@@ -0,0 +1,5 @@
+tarball=distlib-VERSION.zip
+sha1=1c575431e31c32d25596c360e81bba7fe4638669
+md5=4baf787d8aceb260d6f77cb31bf27cf6
+cksum=2902365751
+upstream_url=https://pypi.io/packages/source/d/distlib/distlib-VERSION.zip
diff --git a/build/pkgs/distlib/dependencies b/build/pkgs/distlib/dependencies
@@ -0,0 +1,4 @@
+$(PYTHON) | $(PYTHON_TOOLCHAIN)
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/distlib/install-requires.txt b/build/pkgs/distlib/install-requires.txt
@@ -0,0 +1 @@
+distlib
diff --git a/build/pkgs/distlib/package-version.txt b/build/pkgs/distlib/package-version.txt
@@ -0,0 +1 @@
+0.3.1
diff --git a/build/pkgs/distlib/spkg-install.in b/build/pkgs/distlib/spkg-install.in
@@ -0,0 +1,2 @@
+cd src
+sdh_pip_install .
diff --git a/build/pkgs/distlib/type b/build/pkgs/distlib/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/filelock/SPKG.rst b/build/pkgs/filelock/SPKG.rst
@@ -0,0 +1,18 @@
+filelock: A platform independent file lock
+==========================================
+
+Description
+-----------
+
+A platform independent file lock.
+
+License
+-------
+
+Public Domain <http://unlicense.org>
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/filelock/
+
diff --git a/build/pkgs/filelock/checksums.ini b/build/pkgs/filelock/checksums.ini
@@ -0,0 +1,5 @@
+tarball=filelock-VERSION.tar.gz
+sha1=ca03bf213ee1d7a9b6353cebc265072aae40fdcb
+md5=c1fe6d9a7433a7ca6ce4f36e273317d1
+cksum=2927344437
+upstream_url=https://pypi.io/packages/source/f/filelock/filelock-VERSION.tar.gz
diff --git a/build/pkgs/filelock/dependencies b/build/pkgs/filelock/dependencies
@@ -0,0 +1,4 @@
+$(PYTHON) | $(PYTHON_TOOLCHAIN)
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/filelock/install-requires.txt b/build/pkgs/filelock/install-requires.txt
@@ -0,0 +1 @@
+filelock
diff --git a/build/pkgs/filelock/package-version.txt b/build/pkgs/filelock/package-version.txt
@@ -0,0 +1 @@
+3.0.12
diff --git a/build/pkgs/filelock/spkg-install.in b/build/pkgs/filelock/spkg-install.in
@@ -0,0 +1,2 @@
+cd src
+sdh_pip_install .
diff --git a/build/pkgs/filelock/type b/build/pkgs/filelock/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/importlib_metadata/checksums.ini b/build/pkgs/importlib_metadata/checksums.ini
@@ -1,5 +1,5 @@
 tarball=importlib_metadata-VERSION.tar.gz
-sha1=bdb2154fb65f956c30cc2766413215f04120929f
-md5=4505ea85600cca1e693a4f8f5dd27ba8
-cksum=608862478
+sha1=9a41be5cdf1fb347fca35640d607cbb27873cd02
+md5=de8753734db41db35d763475b3cf56be
+cksum=2900617554
 upstream_url=https://pypi.io/packages/source/i/importlib_metadata/importlib_metadata-VERSION.tar.gz
diff --git a/build/pkgs/importlib_metadata/dependencies b/build/pkgs/importlib_metadata/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) vcversioner zipp | $(PYTHON_TOOLCHAIN)
+$(PYTHON) zipp typing_extensions | $(PYTHON_TOOLCHAIN) toml
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/importlib_metadata/package-version.txt b/build/pkgs/importlib_metadata/package-version.txt
@@ -1 +1 @@
-1.7.0
+4.0.1
diff --git a/build/pkgs/importlib_resources/SPKG.rst b/build/pkgs/importlib_resources/SPKG.rst
@@ -0,0 +1,18 @@
+importlib_resources: Read resources from Python packages
+========================================================
+
+Description
+-----------
+
+Read resources from Python packages
+
+License
+-------
+
+Apache2
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/importlib-resources/
+
diff --git a/build/pkgs/importlib_resources/checksums.ini b/build/pkgs/importlib_resources/checksums.ini
@@ -0,0 +1,5 @@
+tarball=importlib_resources-VERSION.tar.gz
+sha1=d4b853132e9b9a0c58610e23df380c84be428c08
+md5=a4586b3cbb3d39c7a5e7ffc49d9ceb53
+cksum=1484460315
+upstream_url=https://pypi.io/packages/source/i/importlib_resources/importlib_resources-VERSION.tar.gz
diff --git a/build/pkgs/importlib_resources/dependencies b/build/pkgs/importlib_resources/dependencies
@@ -0,0 +1,4 @@
+$(PYTHON) | $(PYTHON_TOOLCHAIN)
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/importlib_resources/install-requires.txt b/build/pkgs/importlib_resources/install-requires.txt
@@ -0,0 +1 @@
+importlib-resources
diff --git a/build/pkgs/importlib_resources/package-version.txt b/build/pkgs/importlib_resources/package-version.txt
@@ -0,0 +1 @@
+5.1.4
diff --git a/build/pkgs/importlib_resources/spkg-install.in b/build/pkgs/importlib_resources/spkg-install.in
@@ -0,0 +1,2 @@
+cd src
+sdh_pip_install .
diff --git a/build/pkgs/importlib_resources/type b/build/pkgs/importlib_resources/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/packaging/checksums.ini b/build/pkgs/packaging/checksums.ini
@@ -1,4 +1,5 @@
 tarball=packaging-VERSION.tar.gz
-sha1=b99fa7af153646722b2d1817bb09906cc5a94bc6
-md5=3208229da731c5d8e29d4d8941e75005
-cksum=1742055469
+sha1=6f8880ab84f05714a2549c1b54314b4f79fee319
+md5=5377308b3ba89f2d78c05e7f485be65d
+cksum=1567718319
+upstream_url=https://pypi.io/packages/source/p/packaging/packaging-VERSION.tar.gz
diff --git a/build/pkgs/packaging/package-version.txt b/build/pkgs/packaging/package-version.txt
@@ -1 +1 @@
-20.4
+20.9
diff --git a/build/pkgs/pip/checksums.ini b/build/pkgs/pip/checksums.ini
@@ -1,5 +1,5 @@
 tarball=pip-VERSION.tar.gz
-sha1=f74aa5460852ab99f4433212af87949168a8181c
-md5=246523bd34dd356e7506adf54d206b12
-cksum=3347074384
+sha1=85a0cca517b854373dfcf43c3cac4ff726120c7f
+md5=7fe80e6b3f94b5350284ed536d5b3a23
+cksum=3136634190
 upstream_url=https://pypi.io/packages/source/p/pip/pip-VERSION.tar.gz
diff --git a/build/pkgs/pip/package-version.txt b/build/pkgs/pip/package-version.txt
@@ -1 +1 @@
-21.0.1
+21.1.1
diff --git a/build/pkgs/pkgconfig/checksums.ini b/build/pkgs/pkgconfig/checksums.ini
@@ -1,4 +1,4 @@
 tarball=pkgconfig-VERSION.tar.gz
-sha1=1e844638e8ba3886b6a28b86500c4414ba910b4e
-md5=9f9cdb224ec0a1e59efcc7cac4b91972
-cksum=1169273382
+sha1=9db3e565c5bd85ceee16cbc162ab4f2f5019153c
+md5=0d889edf670b644bfeaa3bb9444169cb
+cksum=3590715331
diff --git a/build/pkgs/pkgconfig/package-version.txt b/build/pkgs/pkgconfig/package-version.txt
@@ -1 +1 @@
-1.5.1
+1.5.2
diff --git a/build/pkgs/pluggy/SPKG.rst b/build/pkgs/pluggy/SPKG.rst
@@ -0,0 +1,18 @@
+pluggy: plugin and hook calling mechanisms for python
+=====================================================
+
+Description
+-----------
+
+plugin and hook calling mechanisms for python
+
+License
+-------
+
+MIT license
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/pluggy/
+
diff --git a/build/pkgs/pluggy/checksums.ini b/build/pkgs/pluggy/checksums.ini
@@ -0,0 +1,5 @@
+tarball=pluggy-VERSION.tar.gz
+sha1=828b2c10996d902b8c47f2fded0e101c636b9ff9
+md5=7f610e28b8b34487336b585a3dfb803d
+cksum=3074963981
+upstream_url=https://pypi.io/packages/source/p/pluggy/pluggy-VERSION.tar.gz
diff --git a/build/pkgs/pluggy/dependencies b/build/pkgs/pluggy/dependencies
@@ -0,0 +1,4 @@
+$(PYTHON) | $(PYTHON_TOOLCHAIN)
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/pluggy/install-requires.txt b/build/pkgs/pluggy/install-requires.txt
@@ -0,0 +1 @@
+pluggy
diff --git a/build/pkgs/pluggy/package-version.txt b/build/pkgs/pluggy/package-version.txt
@@ -0,0 +1 @@
+0.13.1
diff --git a/build/pkgs/pluggy/spkg-install.in b/build/pkgs/pluggy/spkg-install.in
@@ -0,0 +1,2 @@
+cd src
+sdh_pip_install .
diff --git a/build/pkgs/pluggy/type b/build/pkgs/pluggy/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/py/SPKG.rst b/build/pkgs/py/SPKG.rst
@@ -0,0 +1,18 @@
+py: library with cross-python path, ini-parsing, io, code, log facilities
+=========================================================================
+
+Description
+-----------
+
+library with cross-python path, ini-parsing, io, code, log facilities
+
+License
+-------
+
+MIT license
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/py/
+
diff --git a/build/pkgs/py/checksums.ini b/build/pkgs/py/checksums.ini
@@ -0,0 +1,5 @@
+tarball=py-VERSION.tar.gz
+sha1=690e4e3dcaeafe02ad4af36233148e7e10032d1a
+md5=5f108bfe00d5468cbdb8071051f86a55
+cksum=220330409
+upstream_url=https://pypi.io/packages/source/p/py/py-VERSION.tar.gz
diff --git a/build/pkgs/py/dependencies b/build/pkgs/py/dependencies
@@ -0,0 +1,4 @@
+$(PYTHON) | $(PYTHON_TOOLCHAIN)
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/py/install-requires.txt b/build/pkgs/py/install-requires.txt
@@ -0,0 +1 @@
+py
diff --git a/build/pkgs/py/package-version.txt b/build/pkgs/py/package-version.txt
@@ -0,0 +1 @@
+1.10.0
diff --git a/build/pkgs/py/spkg-install.in b/build/pkgs/py/spkg-install.in
@@ -0,0 +1,2 @@
+cd src
+sdh_pip_install .
diff --git a/build/pkgs/py/type b/build/pkgs/py/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/setuptools/checksums.ini b/build/pkgs/setuptools/checksums.ini
@@ -1,5 +1,5 @@
 tarball=setuptools-VERSION.tar.gz
-sha1=77d3f0bd339c3d7778b3b7dacd14f47d09ac56be
-md5=e22db062c2429f9dd7239aecdeb64d6f
-cksum=3206580377
+sha1=93a2efe727c901cd140fad483b5e05d5f8117ec2
+md5=e8caf0f129f585a887bb3cbb528149d1
+cksum=591865795
 upstream_url=https://pypi.io/packages/source/s/setuptools/setuptools-VERSION.tar.gz
diff --git a/build/pkgs/setuptools/package-version.txt b/build/pkgs/setuptools/package-version.txt
@@ -1 +1 @@
-51.1.1.p0
+56.2.0
diff --git a/build/pkgs/toml/SPKG.rst b/build/pkgs/toml/SPKG.rst
@@ -0,0 +1,18 @@
+toml: Python Library for Tom's Obvious, Minimal Language
+========================================================
+
+Description
+-----------
+
+Python Library for Tom's Obvious, Minimal Language
+
+License
+-------
+
+MIT
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/toml/
+
diff --git a/build/pkgs/toml/checksums.ini b/build/pkgs/toml/checksums.ini
@@ -0,0 +1,5 @@
+tarball=toml-VERSION.tar.gz
+sha1=00137fc72f31100edd1c03670081b03053b6c836
+md5=59bce5d8d67e858735ec3f399ec90253
+cksum=3015531877
+upstream_url=https://pypi.io/packages/source/t/toml/toml-VERSION.tar.gz
diff --git a/build/pkgs/toml/dependencies b/build/pkgs/toml/dependencies
@@ -0,0 +1,4 @@
+$(PYTHON) | $(PYTHON_TOOLCHAIN)
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/toml/install-requires.txt b/build/pkgs/toml/install-requires.txt
@@ -0,0 +1 @@
+toml
diff --git a/build/pkgs/toml/package-version.txt b/build/pkgs/toml/package-version.txt
@@ -0,0 +1 @@
+0.10.2
diff --git a/build/pkgs/toml/spkg-install.in b/build/pkgs/toml/spkg-install.in
@@ -0,0 +1,2 @@
+cd src
+sdh_pip_install .
diff --git a/build/pkgs/toml/type b/build/pkgs/toml/type
@@ -0,0 +1 @@
+standard
diff --git a/build/pkgs/tox/SPKG.rst b/build/pkgs/tox/SPKG.rst
@@ -1,21 +1,18 @@
-tox: A command line driven CI frontend and development task automation tool
-===========================================================================
+tox: tox is a generic virtualenv management and test command line tool
+======================================================================
 
 Description
 -----------
 
-Command line driven CI frontend and development task automation tool.
-
-The Sage library uses tox as an entry point for testing and linting. See ``src/tox.ini`` and ``sage --advanced``.
-
-Sage-the-distribution uses tox for portability testing.  See ``SAGE_ROOT/tox.ini``.
+tox is a generic virtualenv management and test command line tool
 
 License
 -------
 
-- MIT License
+MIT
 
 Upstream Contact
 ----------------
 
 https://pypi.org/project/tox/
+
diff --git a/build/pkgs/tox/checksums.ini b/build/pkgs/tox/checksums.ini
@@ -0,0 +1,5 @@
+tarball=tox-VERSION.tar.gz
+sha1=e98277cf47d1e4ca9dbaeeaf7e0e301700c9694b
+md5=9fe85f2cab666ad764f5a076c4544956
+cksum=2996434561
+upstream_url=https://pypi.io/packages/source/t/tox/tox-VERSION.tar.gz
diff --git a/build/pkgs/tox/dependencies b/build/pkgs/tox/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) packaging six | $(PYTHON_TOOLCHAIN)
+$(PYTHON) packaging six filelock pluggy py toml virtualenv importlib_metadata | $(PYTHON_TOOLCHAIN)
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/tox/install-requires.txt b/build/pkgs/tox/install-requires.txt
@@ -1,2 +1 @@
-# Matches version checked in spkg-configure.m4
-tox >=2.5.0
+tox
diff --git a/build/pkgs/tox/package-version.txt b/build/pkgs/tox/package-version.txt
@@ -0,0 +1 @@
+3.23.1
diff --git a/build/pkgs/tox/requirements.txt b/build/pkgs/tox/requirements.txt
diff --git a/build/pkgs/tox/spkg-install.in b/build/pkgs/tox/spkg-install.in
@@ -0,0 +1,2 @@
+cd src
+sdh_pip_install .
diff --git a/build/pkgs/tox/type b/build/pkgs/tox/type
@@ -1 +1 @@
-optional
+standard
diff --git a/build/pkgs/typing_extensions/SPKG.rst b/build/pkgs/typing_extensions/SPKG.rst
diff --git a/build/pkgs/typing_extensions/checksums.ini b/build/pkgs/typing_extensions/checksums.ini
diff --git a/build/pkgs/typing_extensions/dependencies b/build/pkgs/typing_extensions/dependencies
diff --git a/build/pkgs/typing_extensions/install-requires.txt b/build/pkgs/typing_extensions/install-requires.txt
diff --git a/build/pkgs/typing_extensions/package-version.txt b/build/pkgs/typing_extensions/package-version.txt
diff --git a/build/pkgs/typing_extensions/spkg-install.in b/build/pkgs/typing_extensions/spkg-install.in
diff --git a/build/pkgs/typing_extensions/type b/build/pkgs/typing_extensions/type
diff --git a/build/pkgs/virtualenv/SPKG.rst b/build/pkgs/virtualenv/SPKG.rst
diff --git a/build/pkgs/virtualenv/checksums.ini b/build/pkgs/virtualenv/checksums.ini
diff --git a/build/pkgs/virtualenv/dependencies b/build/pkgs/virtualenv/dependencies
diff --git a/build/pkgs/virtualenv/install-requires.txt b/build/pkgs/virtualenv/install-requires.txt
diff --git a/build/pkgs/virtualenv/package-version.txt b/build/pkgs/virtualenv/package-version.txt
diff --git a/build/pkgs/virtualenv/spkg-install.in b/build/pkgs/virtualenv/spkg-install.in
diff --git a/build/pkgs/virtualenv/type b/build/pkgs/virtualenv/type

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +$(PYTHON) | $(PYTHON_TOOLCHAIN)
++
 +----------
 +All lines of this file are ignored except the first.