From e694b15834292f2962862176c2de8714731ced05 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 9 Sep 2020 09:01:38 -0700 Subject: [PATCH 1/7] build/pkgs/tox: Make it a standard package --- build/pkgs/tox/checksums.ini | 5 +++++ build/pkgs/tox/package-version.txt | 1 + build/pkgs/tox/requirements.txt | 1 - build/pkgs/tox/spkg-install.in | 1 + build/pkgs/tox/type | 2 +- 5 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 build/pkgs/tox/checksums.ini create mode 100644 build/pkgs/tox/package-version.txt delete mode 100644 build/pkgs/tox/requirements.txt create mode 100644 build/pkgs/tox/spkg-install.in diff --git a/build/pkgs/tox/checksums.ini b/build/pkgs/tox/checksums.ini new file mode 100644 index 00000000000..2ae4ae99f72 --- /dev/null +++ b/build/pkgs/tox/checksums.ini @@ -0,0 +1,5 @@ +tarball=tox-VERSION.tar.gz +sha1=a2a435c46cc0f03a55413506cb9d737e62d6047d +md5=e3219ce6f0543141244b77cd701b0ea1 +cksum=2446556337 +upstream_url=https://pypi.io/packages/source/t/tox/tox-VERSION.tar.gz diff --git a/build/pkgs/tox/package-version.txt b/build/pkgs/tox/package-version.txt new file mode 100644 index 00000000000..eb9b76c9f59 --- /dev/null +++ b/build/pkgs/tox/package-version.txt @@ -0,0 +1 @@ +3.20.0 diff --git a/build/pkgs/tox/requirements.txt b/build/pkgs/tox/requirements.txt deleted file mode 100644 index 053148f8486..00000000000 --- a/build/pkgs/tox/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -tox diff --git a/build/pkgs/tox/spkg-install.in b/build/pkgs/tox/spkg-install.in new file mode 100644 index 00000000000..deba1bb42bb --- /dev/null +++ b/build/pkgs/tox/spkg-install.in @@ -0,0 +1 @@ +cd src && sdh_pip_install . diff --git a/build/pkgs/tox/type b/build/pkgs/tox/type index 134d9bc32d5..a6a7b9cd726 100644 --- a/build/pkgs/tox/type +++ b/build/pkgs/tox/type @@ -1 +1 @@ -optional +standard From 9c7a1c2333882039d19da02872a691808c0f9e22 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 27 Dec 2020 10:02:51 -0800 Subject: [PATCH 2/7] build/pkgs: Add tox dependencies: filelock py virtualenv pluggy --- build/pkgs/filelock/SPKG.rst | 18 ++++++++++++++++++ build/pkgs/filelock/checksums.ini | 5 +++++ build/pkgs/filelock/dependencies | 4 ++++ build/pkgs/filelock/install-requires.txt | 1 + build/pkgs/filelock/package-version.txt | 1 + build/pkgs/filelock/spkg-install.in | 2 ++ build/pkgs/filelock/type | 1 + build/pkgs/pluggy/SPKG.rst | 18 ++++++++++++++++++ build/pkgs/pluggy/checksums.ini | 5 +++++ build/pkgs/pluggy/dependencies | 4 ++++ build/pkgs/pluggy/install-requires.txt | 1 + build/pkgs/pluggy/package-version.txt | 1 + build/pkgs/pluggy/spkg-install.in | 2 ++ build/pkgs/pluggy/type | 1 + build/pkgs/py/SPKG.rst | 18 ++++++++++++++++++ build/pkgs/py/checksums.ini | 5 +++++ build/pkgs/py/dependencies | 4 ++++ build/pkgs/py/install-requires.txt | 1 + build/pkgs/py/package-version.txt | 1 + build/pkgs/py/spkg-install.in | 2 ++ build/pkgs/py/type | 1 + build/pkgs/tox/dependencies | 2 +- build/pkgs/virtualenv/SPKG.rst | 18 ++++++++++++++++++ build/pkgs/virtualenv/checksums.ini | 5 +++++ build/pkgs/virtualenv/dependencies | 4 ++++ build/pkgs/virtualenv/install-requires.txt | 1 + build/pkgs/virtualenv/package-version.txt | 1 + build/pkgs/virtualenv/spkg-install.in | 2 ++ build/pkgs/virtualenv/type | 1 + 29 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 build/pkgs/filelock/SPKG.rst create mode 100644 build/pkgs/filelock/checksums.ini create mode 100644 build/pkgs/filelock/dependencies create mode 100644 build/pkgs/filelock/install-requires.txt create mode 100644 build/pkgs/filelock/package-version.txt create mode 100644 build/pkgs/filelock/spkg-install.in create mode 100644 build/pkgs/filelock/type create mode 100644 build/pkgs/pluggy/SPKG.rst create mode 100644 build/pkgs/pluggy/checksums.ini create mode 100644 build/pkgs/pluggy/dependencies create mode 100644 build/pkgs/pluggy/install-requires.txt create mode 100644 build/pkgs/pluggy/package-version.txt create mode 100644 build/pkgs/pluggy/spkg-install.in create mode 100644 build/pkgs/pluggy/type create mode 100644 build/pkgs/py/SPKG.rst create mode 100644 build/pkgs/py/checksums.ini create mode 100644 build/pkgs/py/dependencies create mode 100644 build/pkgs/py/install-requires.txt create mode 100644 build/pkgs/py/package-version.txt create mode 100644 build/pkgs/py/spkg-install.in create mode 100644 build/pkgs/py/type create mode 100644 build/pkgs/virtualenv/SPKG.rst create mode 100644 build/pkgs/virtualenv/checksums.ini create mode 100644 build/pkgs/virtualenv/dependencies create mode 100644 build/pkgs/virtualenv/install-requires.txt create mode 100644 build/pkgs/virtualenv/package-version.txt create mode 100644 build/pkgs/virtualenv/spkg-install.in create mode 100644 build/pkgs/virtualenv/type diff --git a/build/pkgs/filelock/SPKG.rst b/build/pkgs/filelock/SPKG.rst new file mode 100644 index 00000000000..b83beec0cc9 --- /dev/null +++ b/build/pkgs/filelock/SPKG.rst @@ -0,0 +1,18 @@ +filelock +======== + +Description +----------- + +A platform independent file lock. + +License +------- + +Public Domain + +Upstream Contact +---------------- + +https://pypi.org/project/filelock/ + diff --git a/build/pkgs/filelock/checksums.ini b/build/pkgs/filelock/checksums.ini new file mode 100644 index 00000000000..a7a437ebb3c --- /dev/null +++ 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 new file mode 100644 index 00000000000..0738c2d7777 --- /dev/null +++ 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 new file mode 100644 index 00000000000..83c2e35706e --- /dev/null +++ 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 new file mode 100644 index 00000000000..f93fc9f42ea --- /dev/null +++ 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 new file mode 100644 index 00000000000..37ac1a53437 --- /dev/null +++ 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 new file mode 100644 index 00000000000..a6a7b9cd726 --- /dev/null +++ b/build/pkgs/filelock/type @@ -0,0 +1 @@ +standard diff --git a/build/pkgs/pluggy/SPKG.rst b/build/pkgs/pluggy/SPKG.rst new file mode 100644 index 00000000000..61fa263e874 --- /dev/null +++ b/build/pkgs/pluggy/SPKG.rst @@ -0,0 +1,18 @@ +pluggy +====== + +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 new file mode 100644 index 00000000000..9a6e585fcc9 --- /dev/null +++ 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 new file mode 100644 index 00000000000..0738c2d7777 --- /dev/null +++ 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 new file mode 100644 index 00000000000..11bdb5c1f5f --- /dev/null +++ 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 new file mode 100644 index 00000000000..c317a91891f --- /dev/null +++ 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 new file mode 100644 index 00000000000..37ac1a53437 --- /dev/null +++ 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 new file mode 100644 index 00000000000..a6a7b9cd726 --- /dev/null +++ b/build/pkgs/pluggy/type @@ -0,0 +1 @@ +standard diff --git a/build/pkgs/py/SPKG.rst b/build/pkgs/py/SPKG.rst new file mode 100644 index 00000000000..b0d28f93e9a --- /dev/null +++ b/build/pkgs/py/SPKG.rst @@ -0,0 +1,18 @@ +py +== + +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 new file mode 100644 index 00000000000..ea29f7298f5 --- /dev/null +++ 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 new file mode 100644 index 00000000000..0738c2d7777 --- /dev/null +++ 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 new file mode 100644 index 00000000000..edfce786a4d --- /dev/null +++ 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 new file mode 100644 index 00000000000..81c871de46b --- /dev/null +++ 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 new file mode 100644 index 00000000000..37ac1a53437 --- /dev/null +++ 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 new file mode 100644 index 00000000000..a6a7b9cd726 --- /dev/null +++ b/build/pkgs/py/type @@ -0,0 +1 @@ +standard diff --git a/build/pkgs/tox/dependencies b/build/pkgs/tox/dependencies index 7b139dc904c..a8747364ef2 100644 --- 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/virtualenv/SPKG.rst b/build/pkgs/virtualenv/SPKG.rst new file mode 100644 index 00000000000..928b7175121 --- /dev/null +++ b/build/pkgs/virtualenv/SPKG.rst @@ -0,0 +1,18 @@ +virtualenv +========== + +Description +----------- + +Virtual Python Environment builder + +License +------- + +MIT + +Upstream Contact +---------------- + +https://pypi.org/project/virtualenv/ + diff --git a/build/pkgs/virtualenv/checksums.ini b/build/pkgs/virtualenv/checksums.ini new file mode 100644 index 00000000000..8992f7e3624 --- /dev/null +++ b/build/pkgs/virtualenv/checksums.ini @@ -0,0 +1,5 @@ +tarball=virtualenv-VERSION.tar.gz +sha1=fd4d72b017ca7e3e64f2ec2f890e45857cd9c510 +md5=ad5f4586b6a03088a399692949712007 +cksum=300371404 +upstream_url=https://pypi.io/packages/source/v/virtualenv/virtualenv-VERSION.tar.gz diff --git a/build/pkgs/virtualenv/dependencies b/build/pkgs/virtualenv/dependencies new file mode 100644 index 00000000000..0738c2d7777 --- /dev/null +++ b/build/pkgs/virtualenv/dependencies @@ -0,0 +1,4 @@ +$(PYTHON) | $(PYTHON_TOOLCHAIN) + +---------- +All lines of this file are ignored except the first. diff --git a/build/pkgs/virtualenv/install-requires.txt b/build/pkgs/virtualenv/install-requires.txt new file mode 100644 index 00000000000..66072c76450 --- /dev/null +++ b/build/pkgs/virtualenv/install-requires.txt @@ -0,0 +1 @@ +virtualenv diff --git a/build/pkgs/virtualenv/package-version.txt b/build/pkgs/virtualenv/package-version.txt new file mode 100644 index 00000000000..5e83434edb2 --- /dev/null +++ b/build/pkgs/virtualenv/package-version.txt @@ -0,0 +1 @@ +20.2.2 diff --git a/build/pkgs/virtualenv/spkg-install.in b/build/pkgs/virtualenv/spkg-install.in new file mode 100644 index 00000000000..37ac1a53437 --- /dev/null +++ b/build/pkgs/virtualenv/spkg-install.in @@ -0,0 +1,2 @@ +cd src +sdh_pip_install . diff --git a/build/pkgs/virtualenv/type b/build/pkgs/virtualenv/type new file mode 100644 index 00000000000..a6a7b9cd726 --- /dev/null +++ b/build/pkgs/virtualenv/type @@ -0,0 +1 @@ +standard From cc2f4ae779d1dc5b03ee94f0f5e1e17c422363ad Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 1 Jan 2021 20:31:11 -0800 Subject: [PATCH 3/7] build/pkgs/{distlib,appdirs,importlib_resources}: Add dependencies of virtualenv --- build/pkgs/appdirs/SPKG.rst | 18 ++++++++++++++++++ build/pkgs/appdirs/checksums.ini | 5 +++++ build/pkgs/appdirs/dependencies | 4 ++++ build/pkgs/appdirs/install-requires.txt | 1 + build/pkgs/appdirs/package-version.txt | 1 + build/pkgs/appdirs/spkg-install.in | 2 ++ build/pkgs/appdirs/type | 1 + build/pkgs/distlib/SPKG.rst | 18 ++++++++++++++++++ build/pkgs/distlib/checksums.ini | 5 +++++ build/pkgs/distlib/dependencies | 4 ++++ build/pkgs/distlib/install-requires.txt | 1 + build/pkgs/distlib/package-version.txt | 1 + build/pkgs/distlib/spkg-install.in | 2 ++ build/pkgs/distlib/type | 1 + build/pkgs/importlib_resources/SPKG.rst | 16 ++++++++++++++++ build/pkgs/importlib_resources/checksums.ini | 5 +++++ build/pkgs/importlib_resources/dependencies | 4 ++++ .../importlib_resources/install-requires.txt | 1 + .../importlib_resources/package-version.txt | 1 + build/pkgs/importlib_resources/spkg-install.in | 2 ++ build/pkgs/importlib_resources/type | 1 + build/pkgs/virtualenv/dependencies | 2 +- 22 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 build/pkgs/appdirs/SPKG.rst create mode 100644 build/pkgs/appdirs/checksums.ini create mode 100644 build/pkgs/appdirs/dependencies create mode 100644 build/pkgs/appdirs/install-requires.txt create mode 100644 build/pkgs/appdirs/package-version.txt create mode 100644 build/pkgs/appdirs/spkg-install.in create mode 100644 build/pkgs/appdirs/type create mode 100644 build/pkgs/distlib/SPKG.rst create mode 100644 build/pkgs/distlib/checksums.ini create mode 100644 build/pkgs/distlib/dependencies create mode 100644 build/pkgs/distlib/install-requires.txt create mode 100644 build/pkgs/distlib/package-version.txt create mode 100644 build/pkgs/distlib/spkg-install.in create mode 100644 build/pkgs/distlib/type create mode 100644 build/pkgs/importlib_resources/SPKG.rst create mode 100644 build/pkgs/importlib_resources/checksums.ini create mode 100644 build/pkgs/importlib_resources/dependencies create mode 100644 build/pkgs/importlib_resources/install-requires.txt create mode 100644 build/pkgs/importlib_resources/package-version.txt create mode 100644 build/pkgs/importlib_resources/spkg-install.in create mode 100644 build/pkgs/importlib_resources/type diff --git a/build/pkgs/appdirs/SPKG.rst b/build/pkgs/appdirs/SPKG.rst new file mode 100644 index 00000000000..6018e327f90 --- /dev/null +++ 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 new file mode 100644 index 00000000000..7b26025094c --- /dev/null +++ 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 new file mode 100644 index 00000000000..0738c2d7777 --- /dev/null +++ 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 new file mode 100644 index 00000000000..d64bc321a11 --- /dev/null +++ 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 new file mode 100644 index 00000000000..1c99cf0e809 --- /dev/null +++ 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 new file mode 100644 index 00000000000..37ac1a53437 --- /dev/null +++ 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 new file mode 100644 index 00000000000..134d9bc32d5 --- /dev/null +++ b/build/pkgs/appdirs/type @@ -0,0 +1 @@ +optional diff --git a/build/pkgs/distlib/SPKG.rst b/build/pkgs/distlib/SPKG.rst new file mode 100644 index 00000000000..a4496c0427a --- /dev/null +++ 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 new file mode 100644 index 00000000000..718023bc038 --- /dev/null +++ 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 new file mode 100644 index 00000000000..0738c2d7777 --- /dev/null +++ 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 new file mode 100644 index 00000000000..f68bb07272d --- /dev/null +++ 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 new file mode 100644 index 00000000000..9e11b32fcaa --- /dev/null +++ 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 new file mode 100644 index 00000000000..37ac1a53437 --- /dev/null +++ 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 new file mode 100644 index 00000000000..134d9bc32d5 --- /dev/null +++ b/build/pkgs/distlib/type @@ -0,0 +1 @@ +optional diff --git a/build/pkgs/importlib_resources/SPKG.rst b/build/pkgs/importlib_resources/SPKG.rst new file mode 100644 index 00000000000..3cb5d240ced --- /dev/null +++ b/build/pkgs/importlib_resources/SPKG.rst @@ -0,0 +1,16 @@ +importlib_resources: Read resources from Python packages +======================================================== + +Description +----------- + +Read resources from Python packages + +License +------- + +Upstream Contact +---------------- + +https://pypi.org/project/importlib-resources/ + diff --git a/build/pkgs/importlib_resources/checksums.ini b/build/pkgs/importlib_resources/checksums.ini new file mode 100644 index 00000000000..70264e8d630 --- /dev/null +++ b/build/pkgs/importlib_resources/checksums.ini @@ -0,0 +1,5 @@ +tarball=importlib_resources-VERSION.tar.gz +sha1=0013136267182579db0ae1df25274a704db896fc +md5=9e6819c7f5c06d7fa7821321b7038af4 +cksum=1660967409 +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 new file mode 100644 index 00000000000..0738c2d7777 --- /dev/null +++ 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 new file mode 100644 index 00000000000..2b0146fc669 --- /dev/null +++ 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 new file mode 100644 index 00000000000..627a3f43a64 --- /dev/null +++ b/build/pkgs/importlib_resources/package-version.txt @@ -0,0 +1 @@ +4.1.1 diff --git a/build/pkgs/importlib_resources/spkg-install.in b/build/pkgs/importlib_resources/spkg-install.in new file mode 100644 index 00000000000..37ac1a53437 --- /dev/null +++ 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 new file mode 100644 index 00000000000..134d9bc32d5 --- /dev/null +++ b/build/pkgs/importlib_resources/type @@ -0,0 +1 @@ +optional diff --git a/build/pkgs/virtualenv/dependencies b/build/pkgs/virtualenv/dependencies index 0738c2d7777..fe7890ee1d0 100644 --- a/build/pkgs/virtualenv/dependencies +++ b/build/pkgs/virtualenv/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) +$(PYTHON) appdirs distlib filelock six importlib_metadata importlib_resources | $(PYTHON_TOOLCHAIN) ---------- All lines of this file are ignored except the first. From 5488ecd9be89b3bc60be1fe58b5544b62dc562ce Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 27 May 2021 16:04:17 -0700 Subject: [PATCH 4/7] build/pkgs: Update tox and dependencies to latest --- build/pkgs/appdirs/type | 2 +- build/pkgs/distlib/type | 2 +- build/pkgs/filelock/SPKG.rst | 4 ++-- build/pkgs/importlib_resources/SPKG.rst | 2 ++ build/pkgs/importlib_resources/checksums.ini | 6 +++--- build/pkgs/importlib_resources/package-version.txt | 2 +- build/pkgs/importlib_resources/type | 2 +- build/pkgs/pluggy/SPKG.rst | 4 ++-- build/pkgs/py/SPKG.rst | 4 ++-- build/pkgs/tox/SPKG.rst | 13 +++++-------- build/pkgs/tox/checksums.ini | 6 +++--- build/pkgs/tox/install-requires.txt | 3 +-- build/pkgs/tox/package-version.txt | 2 +- build/pkgs/tox/spkg-install.in | 3 ++- build/pkgs/virtualenv/SPKG.rst | 4 ++-- build/pkgs/virtualenv/checksums.ini | 6 +++--- build/pkgs/virtualenv/package-version.txt | 2 +- 17 files changed, 33 insertions(+), 34 deletions(-) diff --git a/build/pkgs/appdirs/type b/build/pkgs/appdirs/type index 134d9bc32d5..a6a7b9cd726 100644 --- a/build/pkgs/appdirs/type +++ b/build/pkgs/appdirs/type @@ -1 +1 @@ -optional +standard diff --git a/build/pkgs/distlib/type b/build/pkgs/distlib/type index 134d9bc32d5..a6a7b9cd726 100644 --- a/build/pkgs/distlib/type +++ b/build/pkgs/distlib/type @@ -1 +1 @@ -optional +standard diff --git a/build/pkgs/filelock/SPKG.rst b/build/pkgs/filelock/SPKG.rst index b83beec0cc9..d39b439be2e 100644 --- a/build/pkgs/filelock/SPKG.rst +++ b/build/pkgs/filelock/SPKG.rst @@ -1,5 +1,5 @@ -filelock -======== +filelock: A platform independent file lock +========================================== Description ----------- diff --git a/build/pkgs/importlib_resources/SPKG.rst b/build/pkgs/importlib_resources/SPKG.rst index 3cb5d240ced..ea519afbe99 100644 --- a/build/pkgs/importlib_resources/SPKG.rst +++ b/build/pkgs/importlib_resources/SPKG.rst @@ -9,6 +9,8 @@ Read resources from Python packages License ------- +Apache2 + Upstream Contact ---------------- diff --git a/build/pkgs/importlib_resources/checksums.ini b/build/pkgs/importlib_resources/checksums.ini index 70264e8d630..7b2b8a13aee 100644 --- a/build/pkgs/importlib_resources/checksums.ini +++ b/build/pkgs/importlib_resources/checksums.ini @@ -1,5 +1,5 @@ tarball=importlib_resources-VERSION.tar.gz -sha1=0013136267182579db0ae1df25274a704db896fc -md5=9e6819c7f5c06d7fa7821321b7038af4 -cksum=1660967409 +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/package-version.txt b/build/pkgs/importlib_resources/package-version.txt index 627a3f43a64..76e9e619d63 100644 --- a/build/pkgs/importlib_resources/package-version.txt +++ b/build/pkgs/importlib_resources/package-version.txt @@ -1 +1 @@ -4.1.1 +5.1.4 diff --git a/build/pkgs/importlib_resources/type b/build/pkgs/importlib_resources/type index 134d9bc32d5..a6a7b9cd726 100644 --- a/build/pkgs/importlib_resources/type +++ b/build/pkgs/importlib_resources/type @@ -1 +1 @@ -optional +standard diff --git a/build/pkgs/pluggy/SPKG.rst b/build/pkgs/pluggy/SPKG.rst index 61fa263e874..b15967007ed 100644 --- a/build/pkgs/pluggy/SPKG.rst +++ b/build/pkgs/pluggy/SPKG.rst @@ -1,5 +1,5 @@ -pluggy -====== +pluggy: plugin and hook calling mechanisms for python +===================================================== Description ----------- diff --git a/build/pkgs/py/SPKG.rst b/build/pkgs/py/SPKG.rst index b0d28f93e9a..bf0409acda7 100644 --- a/build/pkgs/py/SPKG.rst +++ b/build/pkgs/py/SPKG.rst @@ -1,5 +1,5 @@ -py -== +py: library with cross-python path, ini-parsing, io, code, log facilities +========================================================================= Description ----------- diff --git a/build/pkgs/tox/SPKG.rst b/build/pkgs/tox/SPKG.rst index 007e28f02a3..442f4e85756 100644 --- 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 index 2ae4ae99f72..c202fbcb281 100644 --- a/build/pkgs/tox/checksums.ini +++ b/build/pkgs/tox/checksums.ini @@ -1,5 +1,5 @@ tarball=tox-VERSION.tar.gz -sha1=a2a435c46cc0f03a55413506cb9d737e62d6047d -md5=e3219ce6f0543141244b77cd701b0ea1 -cksum=2446556337 +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/install-requires.txt b/build/pkgs/tox/install-requires.txt index eb752fd0762..053148f8486 100644 --- 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 index eb9b76c9f59..9b2f2a16885 100644 --- a/build/pkgs/tox/package-version.txt +++ b/build/pkgs/tox/package-version.txt @@ -1 +1 @@ -3.20.0 +3.23.1 diff --git a/build/pkgs/tox/spkg-install.in b/build/pkgs/tox/spkg-install.in index deba1bb42bb..37ac1a53437 100644 --- a/build/pkgs/tox/spkg-install.in +++ b/build/pkgs/tox/spkg-install.in @@ -1 +1,2 @@ -cd src && sdh_pip_install . +cd src +sdh_pip_install . diff --git a/build/pkgs/virtualenv/SPKG.rst b/build/pkgs/virtualenv/SPKG.rst index 928b7175121..9b869626ce4 100644 --- a/build/pkgs/virtualenv/SPKG.rst +++ b/build/pkgs/virtualenv/SPKG.rst @@ -1,5 +1,5 @@ -virtualenv -========== +virtualenv: Virtual Python Environment builder +============================================== Description ----------- diff --git a/build/pkgs/virtualenv/checksums.ini b/build/pkgs/virtualenv/checksums.ini index 8992f7e3624..177479bc005 100644 --- a/build/pkgs/virtualenv/checksums.ini +++ b/build/pkgs/virtualenv/checksums.ini @@ -1,5 +1,5 @@ tarball=virtualenv-VERSION.tar.gz -sha1=fd4d72b017ca7e3e64f2ec2f890e45857cd9c510 -md5=ad5f4586b6a03088a399692949712007 -cksum=300371404 +sha1=42c609ae86f5b6b3d491e4a865235e71ed35bfd3 +md5=6693920d5de24bd3e6ec8a6749c22b0d +cksum=2813528266 upstream_url=https://pypi.io/packages/source/v/virtualenv/virtualenv-VERSION.tar.gz diff --git a/build/pkgs/virtualenv/package-version.txt b/build/pkgs/virtualenv/package-version.txt index 5e83434edb2..f065d76cc07 100644 --- a/build/pkgs/virtualenv/package-version.txt +++ b/build/pkgs/virtualenv/package-version.txt @@ -1 +1 @@ -20.2.2 +20.4.7 From b9c4ec8aadeb3c2977e9899cbd65bae7d9bc2761 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 27 May 2021 16:09:18 -0700 Subject: [PATCH 5/7] build/pkgs/packaging/checksums.ini: Add upstream_url --- build/pkgs/packaging/checksums.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/build/pkgs/packaging/checksums.ini b/build/pkgs/packaging/checksums.ini index 68db6c29e45..d129ec14022 100644 --- a/build/pkgs/packaging/checksums.ini +++ b/build/pkgs/packaging/checksums.ini @@ -2,3 +2,4 @@ tarball=packaging-VERSION.tar.gz sha1=6f8880ab84f05714a2549c1b54314b4f79fee319 md5=5377308b3ba89f2d78c05e7f485be65d cksum=1567718319 +upstream_url=https://pypi.io/packages/source/p/packaging/packaging-VERSION.tar.gz From ce2ec11d5f9cdb37e4b8d746836dbb5461e64ed7 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 27 May 2021 22:35:15 -0700 Subject: [PATCH 6/7] build/pkgs/py/dependencies: Add setuptools_scm (a setup-requires) --- build/pkgs/py/dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/py/dependencies b/build/pkgs/py/dependencies index 0738c2d7777..14a312e5dee 100644 --- a/build/pkgs/py/dependencies +++ b/build/pkgs/py/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) | $(PYTHON_TOOLCHAIN) +$(PYTHON) | $(PYTHON_TOOLCHAIN) setuptools_scm ---------- All lines of this file are ignored except the first. From 65e6330c118a89e21b8ba13bcfc9a407550bad63 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 28 May 2021 17:53:43 -0700 Subject: [PATCH 7/7] build/pkgs{appdirs,distlib,filelock,virtualenv}/spkg-configure.m4: Mark as not required if system tox is used --- build/pkgs/appdirs/spkg-configure.m4 | 7 +++++++ build/pkgs/distlib/spkg-configure.m4 | 7 +++++++ build/pkgs/filelock/spkg-configure.m4 | 9 +++++++++ build/pkgs/virtualenv/spkg-configure.m4 | 7 +++++++ 4 files changed, 30 insertions(+) create mode 100644 build/pkgs/appdirs/spkg-configure.m4 create mode 100644 build/pkgs/distlib/spkg-configure.m4 create mode 100644 build/pkgs/filelock/spkg-configure.m4 create mode 100644 build/pkgs/virtualenv/spkg-configure.m4 diff --git a/build/pkgs/appdirs/spkg-configure.m4 b/build/pkgs/appdirs/spkg-configure.m4 new file mode 100644 index 00000000000..098659476dc --- /dev/null +++ b/build/pkgs/appdirs/spkg-configure.m4 @@ -0,0 +1,7 @@ +SAGE_SPKG_CONFIGURE([appdirs], [ + sage_spkg_install_appdirs=yes + ], [dnl REQUIRED-CHECK + AC_REQUIRE([SAGE_SPKG_CONFIGURE_VIRTUALENV]) + dnl only needed as a dependency of virtualenv. + AS_VAR_SET([SPKG_REQUIRE], [$sage_spkg_install_virtualenv]) + ]) diff --git a/build/pkgs/distlib/spkg-configure.m4 b/build/pkgs/distlib/spkg-configure.m4 new file mode 100644 index 00000000000..00c32e2e0da --- /dev/null +++ b/build/pkgs/distlib/spkg-configure.m4 @@ -0,0 +1,7 @@ +SAGE_SPKG_CONFIGURE([distlib], [ + AC_REQUIRE([SAGE_SPKG_CONFIGURE_VIRTUALENV]) + sage_spkg_install_distlib=yes + ], [dnl REQUIRED-CHECK + dnl only needed as a dependency of virtualenv. + AS_VAR_SET([SPKG_REQUIRE], [$sage_spkg_install_virtualenv]) + ]) diff --git a/build/pkgs/filelock/spkg-configure.m4 b/build/pkgs/filelock/spkg-configure.m4 new file mode 100644 index 00000000000..b14299a9130 --- /dev/null +++ b/build/pkgs/filelock/spkg-configure.m4 @@ -0,0 +1,9 @@ +SAGE_SPKG_CONFIGURE([filelock], [ + sage_spkg_install_filelock=yes + ], [dnl REQUIRED-CHECK + AC_REQUIRE([SAGE_SPKG_CONFIGURE_VIRTUALENV]) + AC_REQUIRE([SAGE_SPKG_CONFIGURE_TOX]) + dnl only needed as a dependency of tox and virtualenv. + AS_IF([test $sage_spkg_install_virtualenv = no -a $sage_spkg_install_tox = no], + AS_VAR_SET([SPKG_REQUIRE], [no])) + ]) diff --git a/build/pkgs/virtualenv/spkg-configure.m4 b/build/pkgs/virtualenv/spkg-configure.m4 new file mode 100644 index 00000000000..9fd26115afb --- /dev/null +++ b/build/pkgs/virtualenv/spkg-configure.m4 @@ -0,0 +1,7 @@ +SAGE_SPKG_CONFIGURE([virtualenv], [ + sage_spkg_install_virtualenv=yes + ], [dnl REQUIRED-CHECK + AC_REQUIRE([SAGE_SPKG_CONFIGURE_TOX]) + dnl virtualenv is only needed when we cannot use system tox. + AS_VAR_SET([SPKG_REQUIRE], [$sage_spkg_install_tox]) + ])