Date: Sunday, November 20, 2022 @ 02:36:26
Author: felixonmars
Revision: 462198
archrelease: copy trunk to extra-any
Added:
python-setuptools/repos/extra-any/PKGBUILD
(from rev 462197, python-setuptools/trunk/PKGBUILD)
python-setuptools/repos/extra-any/add-dependency.patch
(from rev 462197, python-setuptools/trunk/add-dependency.patch)
python-setuptools/repos/extra-any/system-validate-pyproject.patch
(from rev 462197, python-setuptools/trunk/system-validate-pyproject.patch)
Deleted:
python-setuptools/repos/extra-any/PKGBUILD
python-setuptools/repos/extra-any/add-dependency.patch
python-setuptools/repos/extra-any/system-validate-pyproject.patch
---------------------------------+
PKGBUILD | 188 +++++++++++++++++++-------------------
add-dependency.patch | 38 +++----
system-validate-pyproject.patch | 62 ++++++------
3 files changed, 144 insertions(+), 144 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-20 02:36:15 UTC (rev 462197)
+++ PKGBUILD 2022-11-20 02:36:26 UTC (rev 462198)
@@ -1,94 +0,0 @@
-# Maintainer: Angel Velasquez <[email protected]>
-# Maintainer: Felix Yan <[email protected]>
-# Contributor: Eli Schwartz <[email protected]>
-
-pkgname=python-setuptools
-pkgver=65.4.1
-pkgrel=1
-epoch=1
-pkgdesc="Easily download, build, install, upgrade, and uninstall Python
packages"
-arch=('any')
-license=('PSF')
-url="https://pypi.org/project/setuptools/";
-depends=('python-appdirs' 'python-jaraco.text' 'python-more-itertools'
'python-ordered-set'
- 'python-packaging' 'python-pyparsing' 'python-tomli'
'python-validate-pyproject')
-makedepends=('git' 'python-setuptools')
-checkdepends=('python-jaraco.envs' 'python-jaraco.path' 'python-mock'
'python-pip' 'python-pip-run'
- 'python-pytest-fixture-config' 'python-pytest-virtualenv'
'python-wheel'
- 'python-pytest-enabler' 'python-pytest-mypy' 'python-sphinx'
'python-build'
- 'python-ini2toml' 'python-tomli-w')
-provides=('python-distribute')
-replaces=('python-distribute')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/pypa/setuptools/archive/v$pkgver.tar.gz";
- system-validate-pyproject.patch
- add-dependency.patch)
-sha512sums=('368c35fe4b3c05aea0bcb7ec0995473e6e9eca6fa51e61e6a908cbaf21972fbe0cdd71bb2aee53a819c2b740119b11a6a24e5da748bcdd19dc9560bc2c27d5f8'
-
'390fea2c575a0042054f51d33e629b04a48f832f0a4a2dd07d34e23cdf330c382dba0f54bfb7c8a6a253bb248a4940f2a789672f715e4dc2aeb395fa185cae7a'
-
'4277c983f17db19b0e499ceff7b6e24aad4f7956ec282bb7f5148f6f44e4e35077bfdfa219cbc04f49f37d0b9dc9c3e3075db7a36dbdc30944e1bd28efad0e0b')
-
-export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
-
-prepare() {
- cd setuptools-$pkgver
-
- patch -p1 -i ../system-validate-pyproject.patch
-
- rm -r {pkg_resources,setuptools}/{extern,_vendor}
setuptools/config/_validate_pyproject
-
- # Upstream devendoring logic is badly broken, see:
- # https://bugs.archlinux.org/task/58670
- # https://github.com/pypa/pip/issues/5429
- # https://github.com/pypa/setuptools/issues/1383
- # The simplest fix is to simply rewrite import paths to use the canonical
- # location in the first place
- for _module in setuptools pkg_resources '' ; do
- find . -name \*.py -exec sed -i \
- -e 's/from '$_module.extern' import/import/' \
- -e 's/from '$_module.extern'\./from /' \
- -e 's/import '$_module.extern'\./import /' \
- -e "s/__import__('$_module.extern./__import__('/" \
- -e 's/from \.\.extern\./from /' \
- {} +
- done
-
- # Add the devendored dependencies into metadata of setuptools
- patch -p1 -i ../add-dependency.patch
-
- # Fix tests invoking python-build
- sed -e 's/"-m", "build", "--wheel"/"-m", "build", "--wheel",
"--no-isolation"/' \
- -e 's/"-m", "build", "--sdist"/"-m", "build", "--sdist",
"--no-isolation"/' \
- -i setuptools/tests/fixtures.py
-
- # Remove post-release tag since we are using stable tags
- sed -e '/tag_build = .post/d' \
- -e '/tag_date = 1/d' \
- -i setup.cfg
-
- # Fix shebang
- sed -i -e "s|^#\!.*/usr/bin/env python|#!/usr/bin/env python3|"
setuptools/command/easy_install.py
-}
-
-build() {
- cd setuptools-$pkgver
- python setup.py build
-}
-
-check() { (
- # Workaround UTF-8 tests by setting LC_CTYPE
- export LC_CTYPE=en_US.UTF-8
-
- # https://github.com/pypa/setuptools/pull/810
- export PYTHONDONTWRITEBYTECODE=1
-
- cd setuptools-$pkgver
- # 1: subtle difference introduced by devendoring
- # 2: pip failures related to devendoring,
- PYTHONPATH="$PWD"/build/lib python -m pytest \
- --deselect
setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
\
- --deselect setuptools/tests/test_virtualenv.py
-)}
-
-package() {
- cd setuptools-$pkgver
- python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
--skip-build
-}
Copied: python-setuptools/repos/extra-any/PKGBUILD (from rev 462197,
python-setuptools/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-11-20 02:36:26 UTC (rev 462198)
@@ -0,0 +1,94 @@
+# Maintainer: Angel Velasquez <[email protected]>
+# Maintainer: Felix Yan <[email protected]>
+# Contributor: Eli Schwartz <[email protected]>
+
+pkgname=python-setuptools
+pkgver=65.5.0
+pkgrel=1
+epoch=1
+pkgdesc="Easily download, build, install, upgrade, and uninstall Python
packages"
+arch=('any')
+license=('PSF')
+url="https://pypi.org/project/setuptools/";
+depends=('python-appdirs' 'python-jaraco.text' 'python-more-itertools'
'python-ordered-set'
+ 'python-packaging' 'python-pyparsing' 'python-tomli'
'python-validate-pyproject')
+makedepends=('git' 'python-setuptools')
+checkdepends=('python-jaraco.envs' 'python-jaraco.path' 'python-mock'
'python-pip' 'python-pip-run'
+ 'python-pytest-fixture-config' 'python-pytest-virtualenv'
'python-wheel'
+ 'python-pytest-enabler' 'python-pytest-mypy' 'python-sphinx'
'python-build'
+ 'python-ini2toml' 'python-tomli-w')
+provides=('python-distribute')
+replaces=('python-distribute')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/pypa/setuptools/archive/v$pkgver.tar.gz";
+ system-validate-pyproject.patch
+ add-dependency.patch)
+sha512sums=('b3ed6546bfa45c96f9b69fd7f014a87b52e6d8a6591340bf980bd4de98e33dbe0990b089940c348f2ad20a27590b82de84aec44c8ba1dce0510a3835653930d3'
+
'390fea2c575a0042054f51d33e629b04a48f832f0a4a2dd07d34e23cdf330c382dba0f54bfb7c8a6a253bb248a4940f2a789672f715e4dc2aeb395fa185cae7a'
+
'4277c983f17db19b0e499ceff7b6e24aad4f7956ec282bb7f5148f6f44e4e35077bfdfa219cbc04f49f37d0b9dc9c3e3075db7a36dbdc30944e1bd28efad0e0b')
+
+export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
+
+prepare() {
+ cd setuptools-$pkgver
+
+ patch -p1 -i ../system-validate-pyproject.patch
+
+ rm -r {pkg_resources,setuptools}/{extern,_vendor}
setuptools/config/_validate_pyproject
+
+ # Upstream devendoring logic is badly broken, see:
+ # https://bugs.archlinux.org/task/58670
+ # https://github.com/pypa/pip/issues/5429
+ # https://github.com/pypa/setuptools/issues/1383
+ # The simplest fix is to simply rewrite import paths to use the canonical
+ # location in the first place
+ for _module in setuptools pkg_resources '' ; do
+ find . -name \*.py -exec sed -i \
+ -e 's/from '$_module.extern' import/import/' \
+ -e 's/from '$_module.extern'\./from /' \
+ -e 's/import '$_module.extern'\./import /' \
+ -e "s/__import__('$_module.extern./__import__('/" \
+ -e 's/from \.\.extern\./from /' \
+ {} +
+ done
+
+ # Add the devendored dependencies into metadata of setuptools
+ patch -p1 -i ../add-dependency.patch
+
+ # Fix tests invoking python-build
+ sed -e 's/"-m", "build", "--wheel"/"-m", "build", "--wheel",
"--no-isolation"/' \
+ -e 's/"-m", "build", "--sdist"/"-m", "build", "--sdist",
"--no-isolation"/' \
+ -i setuptools/tests/fixtures.py
+
+ # Remove post-release tag since we are using stable tags
+ sed -e '/tag_build = .post/d' \
+ -e '/tag_date = 1/d' \
+ -i setup.cfg
+
+ # Fix shebang
+ sed -i -e "s|^#\!.*/usr/bin/env python|#!/usr/bin/env python3|"
setuptools/command/easy_install.py
+}
+
+build() {
+ cd setuptools-$pkgver
+ python setup.py build
+}
+
+check() { (
+ # Workaround UTF-8 tests by setting LC_CTYPE
+ export LC_CTYPE=en_US.UTF-8
+
+ # https://github.com/pypa/setuptools/pull/810
+ export PYTHONDONTWRITEBYTECODE=1
+
+ cd setuptools-$pkgver
+ # 1: subtle difference introduced by devendoring
+ # 2: pip failures related to devendoring,
+ PYTHONPATH="$PWD"/build/lib python -m pytest \
+ --deselect
setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
\
+ --deselect setuptools/tests/test_virtualenv.py
+)}
+
+package() {
+ cd setuptools-$pkgver
+ python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
--skip-build
+}
Deleted: add-dependency.patch
===================================================================
--- add-dependency.patch 2022-11-20 02:36:15 UTC (rev 462197)
+++ add-dependency.patch 2022-11-20 02:36:26 UTC (rev 462198)
@@ -1,19 +0,0 @@
-diff --git a/setup.cfg.org b/setup.cfg
-index f9dd790..0cd700e 100644
---- a/setup.cfg.orig
-+++ b/setup.cfg
-@@ -26,6 +26,14 @@ packages = find_namespace:
- # include_package_data = true
- python_requires = >=3.7
- install_requires =
-+ appdirs
-+ jaraco.text
-+ more-itertools
-+ ordered-set
-+ packaging
-+ pyparsing
-+ tomli
-+ validate-pyproject
-
- [options.packages.find]
- exclude =
Copied: python-setuptools/repos/extra-any/add-dependency.patch (from rev
462197, python-setuptools/trunk/add-dependency.patch)
===================================================================
--- add-dependency.patch (rev 0)
+++ add-dependency.patch 2022-11-20 02:36:26 UTC (rev 462198)
@@ -0,0 +1,19 @@
+diff --git a/setup.cfg.org b/setup.cfg
+index f9dd790..0cd700e 100644
+--- a/setup.cfg.orig
++++ b/setup.cfg
+@@ -26,6 +26,14 @@ packages = find_namespace:
+ # include_package_data = true
+ python_requires = >=3.7
+ install_requires =
++ appdirs
++ jaraco.text
++ more-itertools
++ ordered-set
++ packaging
++ pyparsing
++ tomli
++ validate-pyproject
+
+ [options.packages.find]
+ exclude =
Deleted: system-validate-pyproject.patch
===================================================================
--- system-validate-pyproject.patch 2022-11-20 02:36:15 UTC (rev 462197)
+++ system-validate-pyproject.patch 2022-11-20 02:36:26 UTC (rev 462198)
@@ -1,31 +0,0 @@
-diff --git a/setuptools/config/pyprojecttoml.py
b/setuptools/config/pyprojecttoml.py
-index d4024956..2c3bd6bf 100644
---- a/setuptools/config/pyprojecttoml.py
-+++ b/setuptools/config/pyprojecttoml.py
-@@ -27,16 +27,22 @@ def load_file(filepath: _Path) -> dict:
-
-
- def validate(config: dict, filepath: _Path) -> bool:
-- from . import _validate_pyproject as validator
-+ import validate_pyproject.api, validate_pyproject.errors,
validate_pyproject.cli, validate_pyproject.plugins
-
-- trove_classifier = validator.FORMAT_FUNCTIONS.get("trove-classifier")
-+ trove_classifier =
validate_pyproject.api.FORMAT_FUNCTIONS.get("trove-classifier")
- if hasattr(trove_classifier, "_disable_download"):
- # Improve reproducibility by default. See issue 31 for
validate-pyproject.
- trove_classifier._disable_download() # type: ignore
-
-+ plugins = validate_pyproject.plugins.list_from_entry_points()
-+ validator = validate_pyproject.api.Validator(
-+ validate_pyproject.cli.select_plugins(plugins, ('setuptools',
'distutils'), ()),
-+ validate_pyproject.api.FORMAT_FUNCTIONS,
-+ )
-+
- try:
-- return validator.validate(config)
-- except validator.ValidationError as ex:
-+ return validator(config)
-+ except validate_pyproject.errors.ValidationError as ex:
- summary = f"configuration error: {ex.summary}"
- if ex.name.strip("`") != "project":
- # Probably it is just a field missing/misnamed, not worthy the
verbosity...
Copied: python-setuptools/repos/extra-any/system-validate-pyproject.patch (from
rev 462197, python-setuptools/trunk/system-validate-pyproject.patch)
===================================================================
--- system-validate-pyproject.patch (rev 0)
+++ system-validate-pyproject.patch 2022-11-20 02:36:26 UTC (rev 462198)
@@ -0,0 +1,31 @@
+diff --git a/setuptools/config/pyprojecttoml.py
b/setuptools/config/pyprojecttoml.py
+index d4024956..2c3bd6bf 100644
+--- a/setuptools/config/pyprojecttoml.py
++++ b/setuptools/config/pyprojecttoml.py
+@@ -27,16 +27,22 @@ def load_file(filepath: _Path) -> dict:
+
+
+ def validate(config: dict, filepath: _Path) -> bool:
+- from . import _validate_pyproject as validator
++ import validate_pyproject.api, validate_pyproject.errors,
validate_pyproject.cli, validate_pyproject.plugins
+
+- trove_classifier = validator.FORMAT_FUNCTIONS.get("trove-classifier")
++ trove_classifier =
validate_pyproject.api.FORMAT_FUNCTIONS.get("trove-classifier")
+ if hasattr(trove_classifier, "_disable_download"):
+ # Improve reproducibility by default. See issue 31 for
validate-pyproject.
+ trove_classifier._disable_download() # type: ignore
+
++ plugins = validate_pyproject.plugins.list_from_entry_points()
++ validator = validate_pyproject.api.Validator(
++ validate_pyproject.cli.select_plugins(plugins, ('setuptools',
'distutils'), ()),
++ validate_pyproject.api.FORMAT_FUNCTIONS,
++ )
++
+ try:
+- return validator.validate(config)
+- except validator.ValidationError as ex:
++ return validator(config)
++ except validate_pyproject.errors.ValidationError as ex:
+ summary = f"configuration error: {ex.summary}"
+ if ex.name.strip("`") != "project":
+ # Probably it is just a field missing/misnamed, not worthy the
verbosity...
