[gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/files/, dev-python/setuptools/

2024-05-14 Thread Michał Górny 
commit: 42c8a9c6444e5fe26ba34a726351e9b38c90e267
Author: Michał Górny  gentoo  org>
AuthorDate: Tue May 14 15:56:15 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue May 14 15:58:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c8a9c6

dev-python/setuptools: Enable testing on py3.13

Signed-off-by: Michał Górny  gentoo.org>

 .../setuptools/files/setuptools-69.5.1-py313.patch | 30 ++
 dev-python/setuptools/setuptools-69.5.1-r1.ebuild  |  8 +++---
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/dev-python/setuptools/files/setuptools-69.5.1-py313.patch 
b/dev-python/setuptools/files/setuptools-69.5.1-py313.patch
new file mode 100644
index ..7222d3dba266
--- /dev/null
+++ b/dev-python/setuptools/files/setuptools-69.5.1-py313.patch
@@ -0,0 +1,30 @@
+From c6266e423fa26aafa01f1df71de7c6613273155e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= 
+Date: Tue, 14 May 2024 16:24:07 +0200
+Subject: [PATCH] Make the validation test for entry-points work with Python
+ 3.13+
+
+The exception in importlib.metadata has changed.
+See https://github.com/python/importlib_metadata/issues/488
+
+This makes an existing test pass with Python 3.13.
+
+Partially fixes https://github.com/pypa/setuptools/issues/4196
+---
+ setuptools/_entry_points.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setuptools/_entry_points.py b/setuptools/_entry_points.py
+index 747a69067e..b244e78387 100644
+--- a/setuptools/_entry_points.py
 b/setuptools/_entry_points.py
+@@ -17,7 +17,8 @@ def ensure_valid(ep):
+ """
+ try:
+ ep.extras
+-except AttributeError as ex:
++except (AttributeError, AssertionError) as ex:
++# Why both? See 
https://github.com/python/importlib_metadata/issues/488
+ msg = (
+ f"Problems to parse {ep}.\nPlease ensure entry-point follows the 
spec: "
+ 
"https://packaging.python.org/en/latest/specifications/entry-points/;

diff --git a/dev-python/setuptools/setuptools-69.5.1-r1.ebuild 
b/dev-python/setuptools/setuptools-69.5.1-r1.ebuild
index dec59bb85752..80af914ad532 100644
--- a/dev-python/setuptools/setuptools-69.5.1-r1.ebuild
+++ b/dev-python/setuptools/setuptools-69.5.1-r1.ebuild
@@ -7,7 +7,7 @@ EAPI=8
 # please bump dev-python/ensurepip-setuptools along with this package!
 
 DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{10..12} pypy3 )
+PYTHON_TESTED=( python3_{10..13} pypy3 )
 PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13 )
 PYTHON_REQ_USE="xml(+)"
 
@@ -42,7 +42,6 @@ BDEPEND="
test? (
$(python_gen_cond_dep '
dev-python/build[${PYTHON_USEDEP}]
-   dev-python/importlib-metadata[${PYTHON_USEDEP}]
>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
@@ -70,7 +69,10 @@ PDEPEND="
 src_prepare() {
local PATCHES=(
# TODO: remove this when we're 100% PEP517 mode
-   "${FILESDIR}"/setuptools-62.4.0-py-compile.patch
+   "${FILESDIR}/setuptools-62.4.0-py-compile.patch"
+
+   # https://github.com/pypa/setuptools/pull/4357
+   "${FILESDIR}/${P}-py313.patch"
)
 
distutils-r1_src_prepare

[gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/files/, dev-python/setuptools/

2022-06-13 Thread Michał Górny 
commit: c681caf49f3a91220210d5ba35bafcdcdfe66692
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jun 14 02:50:36 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jun 14 04:26:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c681caf4

dev-python/setuptools: Bump to 62.4.0

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/setuptools/Manifest |   1 +
 .../files/setuptools-62.4.0-py-compile.patch   |  86 ++
 dev-python/setuptools/setuptools-62.4.0.ebuild | 130 +
 3 files changed, 217 insertions(+)

diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index fc04528a65dc..fa0428f394aa 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,3 +1,4 @@
 DIST python-gentoo-patches-3.10.4.tar.xz 8592 BLAKE2B 
67fba3e1fedb17430e5cd93da995b4acaf714db512031b5a2f775a25f793f007941561663cfa413d645ccddc2e22d65d250a40fa166cafda8805488d877ff57d
 SHA512 
3ed2b8ff8f1eb8febe7dcd4b5d13d6d54468be1d525f8f1118977d3bbc78f690a597b09383939d023b03380a306e4bff1693382e29ff562312d803305b1709b2
 DIST setuptools-62.3.3.tar.gz 2586270 BLAKE2B 
764f90a5b2585f05b6ae0ad23568a08069bb4ca776c969635dfaceb6b3f64dc6d56291c3e9f0a4540f0416eab9122f5d7d6ad193a5f604949b5827f3cfc2d1a9
 SHA512 
a7ca81b3f7adedb15a4ff3607654d1a4615de1b30a22aa5cbe4b0a8077db8bdd9348167cbb6deb97e1076d320c2a2a4b0d30acda389905d6503786902eeb66af
 DIST setuptools-62.3.4.tar.gz 2590435 BLAKE2B 
089bb185b65107d54b3a17b423caa28b0505566f8e19efaf34ac347e074492278699295b5e8856756312182a78d524ae5098e86783c5c6e089bdbe2de1d1f60d
 SHA512 
edd9595971ee3cca2d1280e695401d8e4aa38796af89f24132d81b897004147ff4f4fc8daebf6fef0606512cc71e09487a2cb416deeecd851a82abed30f57887
+DIST setuptools-62.4.0.tar.gz 2592908 BLAKE2B 
5221c32545d451fe9e80f6c78296044fc805e995578f32d2a8809483c00ea84f918a3bb5e1d1a6d184533282d96a68fab8b4d303d839255a640952d1c575f53a
 SHA512 
552bb6c93793a438d8d319b1ef51932e7e15fab965b9fc81a4f15015e02f3e7318b9df9890c3fb59fac1ec443c17cd5cbd17b7227a6a82deb355230673ae9ec5

diff --git a/dev-python/setuptools/files/setuptools-62.4.0-py-compile.patch 
b/dev-python/setuptools/files/setuptools-62.4.0-py-compile.patch
new file mode 100644
index ..09d630b363a2
--- /dev/null
+++ b/dev-python/setuptools/files/setuptools-62.4.0-py-compile.patch
@@ -0,0 +1,86 @@
+From 8911d627245f4389488c5d65cce6d1258f4cce7b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
+Date: Tue, 14 Jun 2022 05:58:20 +0200
+Subject: [PATCH] make -OO enable both opt-1 and opt-2
+
+---
+ setuptools/_distutils/command/build_py.py| 10 --
+ setuptools/_distutils/command/install_lib.py | 14 ++
+ 2 files changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/setuptools/_distutils/command/build_py.py 
b/setuptools/_distutils/command/build_py.py
+index 1b22004e..88565bce 100644
+--- a/setuptools/_distutils/command/build_py.py
 b/setuptools/_distutils/command/build_py.py
+@@ -325,11 +325,9 @@ class build_py(Command):
+ outputs.append(
+ importlib.util.cache_from_source(filename, 
optimization='')
+ )
+-if self.optimize > 0:
++for opt in range(1, self.optimize + 1):
+ outputs.append(
+-importlib.util.cache_from_source(
+-filename, optimization=self.optimize
+-)
++importlib.util.cache_from_source(filename, 
optimization=opt)
+ )
+ 
+ outputs += [
+@@ -403,10 +401,10 @@ class build_py(Command):
+ byte_compile(
+ files, optimize=0, force=self.force, prefix=prefix, 
dry_run=self.dry_run
+ )
+-if self.optimize > 0:
++for opt in range(1, self.optimize + 1):
+ byte_compile(
+ files,
+-optimize=self.optimize,
++optimize=opt,
+ force=self.force,
+ prefix=prefix,
+ dry_run=self.dry_run,
+diff --git a/setuptools/_distutils/command/install_lib.py 
b/setuptools/_distutils/command/install_lib.py
+index ad3089c8..7f906a29 100644
+--- a/setuptools/_distutils/command/install_lib.py
 b/setuptools/_distutils/command/install_lib.py
+@@ -25,8 +25,8 @@ class install_lib(Command):
+ #   2) compile .pyc only (--compile --no-optimize; default)
+ #   3) compile .pyc and "opt-1" .pyc (--compile --optimize)
+ #   4) compile "opt-1" .pyc only (--no-compile --optimize)
+-#   5) compile .pyc and "opt-2" .pyc (--compile --optimize-more)
+-#   6) compile "opt-2" .pyc only (--no-compile --optimize-more)
++#   5) compile .pyc, "opt-1" and "opt-2" .pyc (--compile --optimize-more)
++#   6) compile "opt-1" and "opt-2" .pyc (--no-compile --optimize-more)
+ #
+ # The UI for this is two options,

[gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/files/, dev-python/setuptools/

2021-09-06 Thread Michał Górny 
commit: 64c559ddee2904aff069b99f6aa51a09934d4795
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Sep  6 05:44:01 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Sep  6 06:23:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64c559dd

dev-python/setuptools: Bump to 57.5.0

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/setuptools/Manifest |  1 +
 .../files/setuptools-57.5.0-syntaxerror.patch  | 37 +
 dev-python/setuptools/setuptools-57.5.0.ebuild | 92 ++
 3 files changed, 130 insertions(+)

diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index d54c265cd19..d1dc27892fc 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,2 +1,3 @@
 DIST python-gentoo-patches-3.10.0rc1.tar.xz 8112 BLAKE2B 
d6f9b44c5a231f447ffe3533afbcaffe0f3b8bdd5a6690f1854bd7e1199d036d11a4cf4abfae345a88c42740ccbd4b72e53cbe28aea1a5db39dda1e5bfd47229
 SHA512 
bba7045f56369ca0354a539f8478a1afed77dc89a9faf548a0cf8959d644360b0afc4f84b95151ebfc2a6553078322c7445073f7a4104e9cd639ccc86ad0f792
 DIST setuptools-57.4.0.tar.gz 2141309 BLAKE2B 
89b386b6d5bbac61df400f60c91a0a9b9ee381aec7d2f65a856c317c7b0b5512c5e9aa8844c0e64f1840a8e954ae22ed542ad97a104d5416b1df2ac02351809b
 SHA512 
7fcc297ea3e6310f2ec8ba5bf0d509e3f4acbce6bde7e5f0fe1b022c147cf88a047471bd4aa278724e86ebc6be800015fb935c7a31dbb6a0801a2d380ddd89f2
+DIST setuptools-57.5.0.tar.gz 2141727 BLAKE2B 
54c065e0bdcb0c3a0a76026d78ab26615e07ee013e684ef18c3731757a38efe38d21d4c99b687595873679d77ab8381483847467c98eb7086d9cac5bd8ec
 SHA512 
9dae7cbddcca0859d128f528232c2ab6baca2b4447bba129a7bbc014c98a8ecc866cc71c7e93900bb93ea4bbbe5e398c1c3b4a4867afb2caf2c38a2d5a46d67c

diff --git a/dev-python/setuptools/files/setuptools-57.5.0-syntaxerror.patch 
b/dev-python/setuptools/files/setuptools-57.5.0-syntaxerror.patch
new file mode 100644
index 000..6df7940
--- /dev/null
+++ b/dev-python/setuptools/files/setuptools-57.5.0-syntaxerror.patch
@@ -0,0 +1,37 @@
+From ad05b5dfebbc9025b631d6afffa25cdda8079d25 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
+Date: Mon, 6 Sep 2021 07:41:24 +0200
+Subject: [PATCH] Fix syntax error in test_build_meta's pyproject.toml files
+
+Fix missing closing quotes in pyproject.toml files used
+in test_build_meta's tests.  This fixes the test failures due
+to TOMLDecodeError.
+---
+ setuptools/tests/test_build_meta.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setuptools/tests/test_build_meta.py 
b/setuptools/tests/test_build_meta.py
+index ab75a189..0f4a1a73 100644
+--- a/setuptools/tests/test_build_meta.py
 b/setuptools/tests/test_build_meta.py
+@@ -167,7 +167,7 @@ class TestBuildMetaBackend:
+ 'pyproject.toml': DALS("""
+ [build-system]
+ requires = ["setuptools", "wheel"]
+-build-backend = "setuptools.build_meta
++build-backend = "setuptools.build_meta"
+ """),
+ }
+ 
+@@ -260,7 +260,7 @@ class TestBuildMetaBackend:
+ 'pyproject.toml': DALS("""
+ [build-system]
+ requires = ["setuptools", "wheel"]
+-build-backend = "setuptools.build_meta
++build-backend = "setuptools.build_meta"
+ """),
+ }
+ path.build(files)
+-- 
+2.33.0
+

diff --git a/dev-python/setuptools/setuptools-57.5.0.ebuild 
b/dev-python/setuptools/setuptools-57.5.0.ebuild
new file mode 100644
index 000..ebe5023e235
--- /dev/null
+++ b/dev-python/setuptools/setuptools-57.5.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.0rc1"
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools 
https://pypi.org/project/setuptools/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+   https://dev.gentoo.org/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+   test? (
+   $(python_gen_cond_dep '
+   dev-python/jaraco-envs[${PYTHON_USEDEP}]
+   >=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+

[gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/files/, dev-python/setuptools/

2020-05-25 Thread Michał Górny 
commit: 3cae20670d1f167c0d467bfded7836a8381277f8
Author: Michał Górny  gentoo  org>
AuthorDate: Mon May 25 11:34:05 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May 25 12:18:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cae2067

dev-python/setuptools: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/setuptools/Manifest |  4 --
 .../files/setuptools-46.2.0-test-warning.patch | 82 --
 dev-python/setuptools/setuptools-46.1.3.ebuild | 66 -
 dev-python/setuptools/setuptools-46.2.0.ebuild | 71 ---
 dev-python/setuptools/setuptools-46.3.0.ebuild | 67 --
 dev-python/setuptools/setuptools-46.3.1.ebuild | 67 --
 6 files changed, 357 deletions(-)

diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 43ec872c82c..b559fac4d6a 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,7 +1,3 @@
 DIST setuptools-44.0.0.zip 858893 BLAKE2B 
02ba2a838487ba9e80d9ca3b8598cecbec4d286f2734be439d2b73f3f7f0ca80e80ea71a0c2322093deb548503c82d6eb32b1585992979b053f14f49baa00baa
 SHA512 
bb48e7763d258e654472bc416d16ec8708eefa95d1eb03cb6e81b623fd636cefc51a0bd67887084ab0214e256e2030a8f655184c3b59ad6937abab6a6178f3a1
 DIST setuptools-44.1.0.zip 858569 BLAKE2B 
f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68
 SHA512 
4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
-DIST setuptools-46.1.3.zip 862431 BLAKE2B 
89d65360e15b22f535312627723ad61df84dce3ee9d5850dd0c60dace0f8c04a502ac6246afe1add1e4fbd0e0dc9530afc8bfd2a4cf058f93cde2ff4184e21f2
 SHA512 
7f8f99313ce2af2cbfa86ff9a3135bc3445804e9323a375b498d20dad7f8fc819481da0c2a057160397e98b6178c1eb453a093652cfdfe7896c9d31732f7ad8c
-DIST setuptools-46.2.0.zip 865117 BLAKE2B 
490387146003e07a5391afa798d1e45a76e9afc81c3e0c484005b3b0bff15f172db2016907199fe2216a4e17379987a53d58149d285be6dcfe7c37a64ce7c359
 SHA512 
d8d89a99c6a3be0a343d6a0e17117ba00393188d69c8995a5dbe9a7772c002fc301a53963288231e3f8053ffda4cafd5406edb2f4650f2036c665f8e3eb5822e
-DIST setuptools-46.3.0.zip 864654 BLAKE2B 
ce916b8f84f777a4baf6dd7458d5a74d7afbc0ede3a60238ce1e6ddf8b4c9837cd88508d4af4577be446d811fc9b997e9361775abaf9308bc9af6f66ca173bfb
 SHA512 
57bc3e1a585a99d9434ed55af037a71665ee7e76ac9dbf19c87260b3d4331183f9eb3c7389c3455407f379ba28a74e90e27346afc614003ae259ab92e3dc16ec
-DIST setuptools-46.3.1.zip 864714 BLAKE2B 
538ede10db4e82d75eec613f909df7d9de8d2821fea74167c30d80fd6c9bf964345ac2054d74d673a2257d32a022e719a0f14db81bfcb6355fe700eace96df2e
 SHA512 
084210cc57021eeafbed92b6419f91eb100a53f3425579331bcf1b6bae314371c3881e5f4680d923a4d4dbe8e94d881d87b3c7aa4ad60500bec68bad399caa6d
 DIST setuptools-46.4.0.zip 865912 BLAKE2B 
452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec
 SHA512 
31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726

diff --git a/dev-python/setuptools/files/setuptools-46.2.0-test-warning.patch 
b/dev-python/setuptools/files/setuptools-46.2.0-test-warning.patch
deleted file mode 100644
index e27db9a41da..000
--- a/dev-python/setuptools/files/setuptools-46.2.0-test-warning.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 56bcce894e99059a8abda29d8b919b0bee7fd1b9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= 
-Date: Tue, 12 May 2020 13:33:04 +0200
-Subject: [PATCH] Reuse @ack_2to3 in TestDevelop.test_2to3_user_mode
-
-Fixes https://github.com/pypa/setuptools/issues/2100

- changelog.d/2105.misc.rst| 1 +
- setuptools/tests/__init__.py | 4 +++-
- setuptools/tests/test_develop.py | 2 ++
- setuptools/tests/test_test.py| 4 +---
- 4 files changed, 7 insertions(+), 4 deletions(-)
- create mode 100644 changelog.d/2105.misc.rst
-
-diff --git a/changelog.d/2105.misc.rst b/changelog.d/2105.misc.rst
-new file mode 100644
-index 0..75eaf2cb3
 /dev/null
-+++ b/changelog.d/2105.misc.rst
-@@ -0,0 +1 @@
-+Filter ``2to3`` deprecation warnings from ``TestDevelop.test_2to3_user_mode``.
-diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
-index 9c77b51f8..6377d7857 100644
 a/setuptools/tests/__init__.py
-+++ b/setuptools/tests/__init__.py
-@@ -6,7 +6,7 @@
- 
- 
- __all__ = [
--'fail_on_ascii', 'py2_only', 'py3_only'
-+'fail_on_ascii', 'py2_only', 'py3_only', 'ack_2to3'
- ]
- 
- 
-@@ -16,3 +16,5 @@
- 
- py2_only = pytest.mark.skipif(not PY2, reason="Test runs on Python 2 only")
- py3_only = pytest.mark.skipif(not PY3, reason="Test runs on Python 3 only")
-+
-+ack_2to3 = pytest.mark.filterwarnings('ignore:2to3 support is deprecated')
-diff --git a/setuptools/tests/test_develop.py

[gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/files/, dev-python/setuptools/

2020-05-13 Thread Michał Górny 
commit: c09787924e5272f8d6f453c274d5a6dac0904b19
Author: Michał Górny  gentoo  org>
AuthorDate: Wed May 13 10:23:12 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed May 13 11:33:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0978792

dev-python/setuptools: Bump to 46.2.0

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/setuptools/Manifest |  1 +
 .../files/setuptools-46.2.0-test-warning.patch | 82 ++
 dev-python/setuptools/setuptools-46.2.0.ebuild | 70 ++
 3 files changed, 153 insertions(+)

diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 07364d4167c..86718e07171 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,3 +1,4 @@
 DIST setuptools-44.0.0.zip 858893 BLAKE2B 
02ba2a838487ba9e80d9ca3b8598cecbec4d286f2734be439d2b73f3f7f0ca80e80ea71a0c2322093deb548503c82d6eb32b1585992979b053f14f49baa00baa
 SHA512 
bb48e7763d258e654472bc416d16ec8708eefa95d1eb03cb6e81b623fd636cefc51a0bd67887084ab0214e256e2030a8f655184c3b59ad6937abab6a6178f3a1
 DIST setuptools-44.1.0.zip 858569 BLAKE2B 
f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68
 SHA512 
4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 DIST setuptools-46.1.3.zip 862431 BLAKE2B 
89d65360e15b22f535312627723ad61df84dce3ee9d5850dd0c60dace0f8c04a502ac6246afe1add1e4fbd0e0dc9530afc8bfd2a4cf058f93cde2ff4184e21f2
 SHA512 
7f8f99313ce2af2cbfa86ff9a3135bc3445804e9323a375b498d20dad7f8fc819481da0c2a057160397e98b6178c1eb453a093652cfdfe7896c9d31732f7ad8c
+DIST setuptools-46.2.0.zip 865117 BLAKE2B 
490387146003e07a5391afa798d1e45a76e9afc81c3e0c484005b3b0bff15f172db2016907199fe2216a4e17379987a53d58149d285be6dcfe7c37a64ce7c359
 SHA512 
d8d89a99c6a3be0a343d6a0e17117ba00393188d69c8995a5dbe9a7772c002fc301a53963288231e3f8053ffda4cafd5406edb2f4650f2036c665f8e3eb5822e

diff --git a/dev-python/setuptools/files/setuptools-46.2.0-test-warning.patch 
b/dev-python/setuptools/files/setuptools-46.2.0-test-warning.patch
new file mode 100644
index 000..e27db9a41da
--- /dev/null
+++ b/dev-python/setuptools/files/setuptools-46.2.0-test-warning.patch
@@ -0,0 +1,82 @@
+From 56bcce894e99059a8abda29d8b919b0bee7fd1b9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= 
+Date: Tue, 12 May 2020 13:33:04 +0200
+Subject: [PATCH] Reuse @ack_2to3 in TestDevelop.test_2to3_user_mode
+
+Fixes https://github.com/pypa/setuptools/issues/2100
+---
+ changelog.d/2105.misc.rst| 1 +
+ setuptools/tests/__init__.py | 4 +++-
+ setuptools/tests/test_develop.py | 2 ++
+ setuptools/tests/test_test.py| 4 +---
+ 4 files changed, 7 insertions(+), 4 deletions(-)
+ create mode 100644 changelog.d/2105.misc.rst
+
+diff --git a/changelog.d/2105.misc.rst b/changelog.d/2105.misc.rst
+new file mode 100644
+index 0..75eaf2cb3
+--- /dev/null
 b/changelog.d/2105.misc.rst
+@@ -0,0 +1 @@
++Filter ``2to3`` deprecation warnings from ``TestDevelop.test_2to3_user_mode``.
+diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
+index 9c77b51f8..6377d7857 100644
+--- a/setuptools/tests/__init__.py
 b/setuptools/tests/__init__.py
+@@ -6,7 +6,7 @@
+ 
+ 
+ __all__ = [
+-'fail_on_ascii', 'py2_only', 'py3_only'
++'fail_on_ascii', 'py2_only', 'py3_only', 'ack_2to3'
+ ]
+ 
+ 
+@@ -16,3 +16,5 @@
+ 
+ py2_only = pytest.mark.skipif(not PY2, reason="Test runs on Python 2 only")
+ py3_only = pytest.mark.skipif(not PY3, reason="Test runs on Python 3 only")
++
++ack_2to3 = pytest.mark.filterwarnings('ignore:2to3 support is deprecated')
+diff --git a/setuptools/tests/test_develop.py 
b/setuptools/tests/test_develop.py
+index 792975fd1..bb89a865b 100644
+--- a/setuptools/tests/test_develop.py
 b/setuptools/tests/test_develop.py
+@@ -17,6 +17,7 @@
+ 
+ from setuptools.command.develop import develop
+ from setuptools.dist import Distribution
++from setuptools.tests import ack_2to3
+ from . import contexts
+ from . import namespaces
+ 
+@@ -65,6 +66,7 @@ class TestDevelop:
+ @pytest.mark.skipif(
+ in_virtualenv or in_venv,
+ reason="Cannot run when invoked in a virtualenv or venv")
++@ack_2to3
+ def test_2to3_user_mode(self, test_env):
+ settings = dict(
+ name='foo',
+diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
+index 0f77d8ff3..892fd120d 100644
+--- a/setuptools/tests/test_test.py
 b/setuptools/tests/test_test.py
+@@ -10,6 +10,7 @@
+ 
+ from setuptools.command.test import test
+ from setuptools.dist import Distribution
++from setuptools.tests import ack_2to3
+ 
+ from .textwrap import DALS
+ 
+@@ -73,9 +74,6 @@ def quiet_log():
+ log.set_verbosity(0)
+ 
+ 
+-ack_2to3 = pytest.mark.filterwarnings('ignore:2to3 support is deprecated')
+-
+-
+

[gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/files/, dev-python/setuptools/

2019-11-24 Thread Michał Górny 
commit: 5e0bf835798e4078e2eabcc3536c52aad2bf414c
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Nov 24 07:58:05 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov 24 11:16:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e0bf835

dev-python/setuptools: Bump to 42.0.0

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/setuptools/Manifest |  1 +
 .../files/setuptools-42.0.0-imp-fix.patch  | 51 +
 dev-python/setuptools/setuptools-42.0.0.ebuild | 89 ++
 3 files changed, 141 insertions(+)

diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 86bee8f127a..3db7d4cf2fd 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,2 +1,3 @@
 DIST setuptools-40.6.3.zip 839328 BLAKE2B 
ddc87213439ce2ad96ba54218bd5b3e41a7c31d670bddb9e4ea058b8ee7dffbe6fcb0e5fd24baf3fb38f5e824fde36aa8dc1e09d7ac37f9375ee351406389cd6
 SHA512 
6c628b8fc67645bca96ddcd016ec9a685e91690bf98dff077e842cfbd0d8d24de76ac51b3ff238d31551a48819d8f694fee6e9bb422ca954e54c22b4bda0038c
 DIST setuptools-41.5.1.zip 851097 BLAKE2B 
2411db77cffb24190c1510c7fab623ae0fb2a248994eae01e1a79427d35d8bf6a2f065de0d95dc11105df0bb42962a57c914486b48dc91115ec32e4dbcbc059d
 SHA512 
eb6e944c80448873f8970477aaf474e75879e2b81b91fdc7a308670fed231d52880c3be3452e7ed3f094f20d4afe54b1db24ec4d98845ed47ee5e71dbf66261d
+DIST setuptools-42.0.0.zip 852125 BLAKE2B 
b3cbba2eb97f7d6d0bb1a1d582c927680ada8d4589c4a196886f95cddd5b8c8b14fb5f0a2397ab7bcdc4ddd5fe6d4eddfab53bf9f43e0781a666f3d88efb8117
 SHA512 
d430605f8da3820b8d902d339b63bc382b9ec1bb0187385f792226bdfa8c191634df69881e1c43ffa8900599307d0ba202cfcb2d30df12d061f8220b9eae854a

diff --git a/dev-python/setuptools/files/setuptools-42.0.0-imp-fix.patch 
b/dev-python/setuptools/files/setuptools-42.0.0-imp-fix.patch
new file mode 100644
index 000..5c96016c92c
--- /dev/null
+++ b/dev-python/setuptools/files/setuptools-42.0.0-imp-fix.patch
@@ -0,0 +1,51 @@
+From bbf825eee764cae0bc44077ccc957a733d53d095 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?=
+ 
+Date: Fri, 15 Nov 2019 08:52:35 +0100
+Subject: [PATCH] Fix _imp module behaviour if is defined paths in find_spec
+ call
+
+fixes #1896
+---
+ setuptools/_imp.py | 15 ---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/setuptools/_imp.py b/setuptools/_imp.py
+index a3cce9b28..6ccec5799 100644
+--- a/setuptools/_imp.py
 b/setuptools/_imp.py
+@@ -19,7 +19,10 @@
+ 
+ def find_module(module, paths=None):
+ """Just like 'imp.find_module()', but with package support"""
+-spec = importlib.util.find_spec(module, paths)
++if isinstance(paths, list):
++spec = importlib.machinery.PathFinder().find_spec(module, paths)
++else:
++spec = importlib.util.find_spec(module, paths)
+ if spec is None:
+ raise ImportError("Can't find %s" % module)
+ if not spec.has_location and hasattr(spec, 'submodule_search_locations'):
+@@ -60,14 +63,20 @@ def find_module(module, paths=None):
+ 
+ 
+ def get_frozen_object(module, paths=None):
+-spec = importlib.util.find_spec(module, paths)
++if isinstance(paths, list):
++spec = importlib.machinery.PathFinder().find_spec(module, paths)
++else:
++spec = importlib.util.find_spec(module, paths)
+ if not spec:
+ raise ImportError("Can't find %s" % module)
+ return spec.loader.get_code(module)
+ 
+ 
+ def get_module(module, paths, info):
+-spec = importlib.util.find_spec(module, paths)
++if isinstance(paths, list):
++spec = importlib.machinery.PathFinder().find_spec(module, paths)
++else:
++spec = importlib.util.find_spec(module, paths)
+ if not spec:
+ raise ImportError("Can't find %s" % module)
+ return module_from_spec(spec)

diff --git a/dev-python/setuptools/setuptools-42.0.0.ebuild 
b/dev-python/setuptools/setuptools-42.0.0.ebuild
new file mode 100644
index 000..e7aa7c945a8
--- /dev/null
+++ b/dev-python/setuptools/setuptools-42.0.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+if [[ ${PV} == "" ]]; then
+   EGIT_REPO_URI="https://github.com/pypa/setuptools.git;
+   inherit git-r3
+else
+   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools 
https://pypi.org/project/setuptools/;
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test