diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-05-24 21:03:24 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-24 21:03:24 +0100 |
commit | cc6fb501ef0f4c443ce79d017dbfbd95072b14f4 (patch) | |
tree | 965126ea0cf6b9fb407442ac2be07121864205e4 /dev-python | |
parent | 59c803bef0bf9b4f167918783e386c3ddb746751 (diff) |
gentoo auto-resync : 24:05:2023 - 21:03:24
Diffstat (limited to 'dev-python')
-rw-r--r-- | dev-python/Manifest.gz | bin | 259032 -> 259029 bytes | |||
-rw-r--r-- | dev-python/distlib/Manifest | 3 | ||||
-rw-r--r-- | dev-python/distlib/distlib-0.3.6.ebuild | 12 | ||||
-rw-r--r-- | dev-python/distlib/files/distlib-0.3.6-py312.patch | 50 | ||||
-rw-r--r-- | dev-python/lxml/Manifest | 2 | ||||
-rw-r--r-- | dev-python/lxml/lxml-4.9.2.ebuild | 1 | ||||
-rw-r--r-- | dev-python/multidict/Manifest | 2 | ||||
-rw-r--r-- | dev-python/multidict/multidict-6.0.4.ebuild | 6 | ||||
-rw-r--r-- | dev-python/pexpect/Manifest | 2 | ||||
-rw-r--r-- | dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild | 3 | ||||
-rw-r--r-- | dev-python/pyyaml/Manifest | 2 | ||||
-rw-r--r-- | dev-python/pyyaml/pyyaml-6.0-r1.ebuild | 2 |
12 files changed, 69 insertions, 16 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz Binary files differindex 62fba43a69f8..91ace284b3a9 100644 --- a/dev-python/Manifest.gz +++ b/dev-python/Manifest.gz diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest index 2ae0a96aba1d..c77f8d7f049c 100644 --- a/dev-python/distlib/Manifest +++ b/dev-python/distlib/Manifest @@ -1,4 +1,5 @@ AUX distlib-0.3.2-system-pypiserver.py 1294 BLAKE2B 87d419e5d9bd90715e43a125617bf12a2eaf16d114557a56fa0c6afb0fa83468960dcfdba3a3eff2ff136c5ef12ec04e71cea2a77a886854181dcdc64aee954e SHA512 08ee2bdc55b30ba770179c97a8dc7f702d72588b6f8bfd65feb47847ee4b41b97c0f31d37e1c4cfc2cff35ccb189abfc07590a175b7d2fd592beda8eb4a8b040 +AUX distlib-0.3.6-py312.patch 2001 BLAKE2B 761b186ba02ceb3af5a5b88523be120707e1e1be401bdf6b63463e88466250df7f83ac0abd2b22abef15fb8a8420247e265434eeb8d69b18ac1b3e8e2a4aca09 SHA512 92af65078333e9e615f1c045f93bd795d894e85fa390c9d2236febd1ea42e9c960cd8e05c0224a11246907f85a790aae63127e695712dbac0522ee05ebddb486 DIST distlib-0.3.6.gh.tar.gz 1234082 BLAKE2B 384b736d9fb9e63d1b9a9375caf972ddfccb36c99903928505e684fe09b30190f873cf7b109beb6c32a1e4b1e11a1d9947adea74f9dceef3398fcc1963a2044a SHA512 39948539764ff5d45f14dc602ebd47d523b71b587ee081d7a267669aef4e4b1013d3995cb992038136bc4c01826ea633c6e4ffd050f1511705b296bf76f3bbf9 -EBUILD distlib-0.3.6.ebuild 1326 BLAKE2B 92942ac2cd4c740d41a56d0dee71605924a51100f9ce04e0e6f1ab295606db0665d07bcd10b8caa6a3e54085ae044232e4294892a403a0f3b7feb35ac115e6d2 SHA512 875b2e54fb274ab0a0bdc82db44c42e7cd064f4bd24f8c29b5226c66a475d71d7634e976802abdfbca8119ed985367ecafaedae41dfbaa917aeb8321ddb3013a +EBUILD distlib-0.3.6.ebuild 1361 BLAKE2B 744c3b04d88b5fc5b5e1071262dc628481d1e0ea2e793d08023d9b233abc77d7e5ccaed0efc019d65ab631b892143e34ceec78f48e348e1a20f586532cdf1528 SHA512 913932c9a414a6b54f6b8d904b84e9a08b6e72c713d09ed8382109573cfce035b69bde7966a44a9779616c9e690a4bb9ee49fa91b75b287a2fe5c899e6458415 MISC metadata.xml 365 BLAKE2B 74d46041d58af096a40f55e08c48562eb11aa8349f2a5afeffad67182c65561b71e2723254df6176b77852f74fd569bb329e21bc8f4ba70828dc8fdb361bf518 SHA512 3d5da338be7508640eaff3ac9360387a6b98d40df477b81e9d4dd9b642e84c8d3fbdbf8c277dfaadc869bd733616329b02607fe56357139be4721d4cabb7996a diff --git a/dev-python/distlib/distlib-0.3.6.ebuild b/dev-python/distlib/distlib-0.3.6.ebuild index 6f1be5b2fb7b..2fb434b9de26 100644 --- a/dev-python/distlib/distlib-0.3.6.ebuild +++ b/dev-python/distlib/distlib-0.3.6.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 @@ -31,12 +31,16 @@ BDEPEND=" " src_prepare() { + local PATCHES=( + "${FILESDIR}/${P}-py312.patch" + + # use system pypiserver instead of bundled one + "${FILESDIR}"/distlib-0.3.2-system-pypiserver.py + ) + # make sure they're not used rm tests/pypi-server-standalone.py || die - # use system pypiserver instead of broken bundled one - eapply "${FILESDIR}"/distlib-0.3.2-system-pypiserver.py || die - distutils-r1_src_prepare } diff --git a/dev-python/distlib/files/distlib-0.3.6-py312.patch b/dev-python/distlib/files/distlib-0.3.6-py312.patch new file mode 100644 index 000000000000..4e1d8927b745 --- /dev/null +++ b/dev-python/distlib/files/distlib-0.3.6-py312.patch @@ -0,0 +1,50 @@ +From fe769c72e4f9d613b2ce066325d2fb28317833d5 Mon Sep 17 00:00:00 2001 +From: Lumir Balhar <lbalhar@redhat.com> +Date: Thu, 18 May 2023 14:09:34 +0200 +Subject: [PATCH 1/2] Check for cert_file attribute before accessing it + +In Python 3.12, HTTPSConnection no longer has cert_file attribute +so unless something adds it to the subclass, the attribute doesn't +exist by default. + +CPython change: https://github.com/python/cpython/commit/ef0e72b31d22f780d3a165d7d0471806061fe380#diff-3cf29d90eb758d0fe5ec013bbfda9b0bb60be4f7d899583bd5f490a7a5a5dc5f +--- + distlib/util.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/distlib/util.py b/distlib/util.py +index dd01849..ddfc992 100644 +--- a/distlib/util.py ++++ b/distlib/util.py +@@ -1435,7 +1435,7 @@ def connect(self): + context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + if hasattr(ssl, 'OP_NO_SSLv2'): + context.options |= ssl.OP_NO_SSLv2 +- if self.cert_file: ++ if hasattr(self, "cert_file") and self.cert_file: + context.load_cert_chain(self.cert_file, self.key_file) + kwargs = {} + if self.ca_certs: + +From 440a7b57b9521ba2eca749e26945eaf16bc7c472 Mon Sep 17 00:00:00 2001 +From: Vinay Sajip <vinay_sajip@yahoo.co.uk> +Date: Wed, 24 May 2023 15:50:44 +0100 +Subject: [PATCH 2/2] Use single quotes. + +--- + distlib/util.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/distlib/util.py b/distlib/util.py +index ddfc992..d1ec58a 100644 +--- a/distlib/util.py ++++ b/distlib/util.py +@@ -1435,7 +1435,7 @@ def connect(self): + context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + if hasattr(ssl, 'OP_NO_SSLv2'): + context.options |= ssl.OP_NO_SSLv2 +- if hasattr(self, "cert_file") and self.cert_file: ++ if hasattr(self, 'cert_file') and self.cert_file: + context.load_cert_chain(self.cert_file, self.key_file) + kwargs = {} + if self.ca_certs: diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest index 04694dc5be13..1e5011fd4450 100644 --- a/dev-python/lxml/Manifest +++ b/dev-python/lxml/Manifest @@ -1,4 +1,4 @@ AUX lxml-4.6.0-tests-pypy.patch 18051 BLAKE2B 99d97fa2e874c9bec4a866c3303b54ea2ab1e6abddf148d142cb66ee035b1eab1e05eed924d34451c5db38dc37f77104539cbfc2fe45815c17445b6359dcb857 SHA512 f6c6c2b00a49e6ca19d8b9123c364003a682c2e8df0c42d8600085d1cb094ba5cedd162bfc794e7d9acfff93aac771953dca5a879c3b957af1e2e8bd1db05515 DIST lxml-4.9.2.gh.tar.gz 957365 BLAKE2B 201b3977da90386e413f1b89a4b7ee1e44d6bbea05e622e92feb1d67c637ce46ebf746f0648f034ed3bccd609233ccf7d8a7ee456f13b8d9ca8587ddf1ebd32a SHA512 816b2fe2eef2a97a0df66cbc39850c6dc3d6470e4033cc73edb40c80c0afbbe6c084d042d7c98b29497926e76f648caa42e1ebe5d83060af08af6972316077b0 -EBUILD lxml-4.9.2.ebuild 2870 BLAKE2B bbb59806a433241e2b3c4b5afcad258e8a4a8922c348adda4207580c8a24a42591f12464c497aed453f90c49635fc03a121ce264f86702eac096f78f5fedd7f6 SHA512 bc2970079902847ba301cadd3d8c90f0e10add5a88069bcfa2d82ecf9cb611da00f7d726d37788abebd4d800402f5b1f178f2b52ba3382dab9ad379ef9541fea +EBUILD lxml-4.9.2.ebuild 2910 BLAKE2B e68e2db46ede7b428a032c553f6bb74e894df215ce3054a920924654ebcd3ce5e55b8d47b4dc17a0ec7e237095a3964ce512c2216cecca8b02a99f8603dbd328 SHA512 57a9a07b497a4f480a58553c83a65dfc3f92266ac71f8e1a73386f0ea356aa0ae347e7a59c72a49e809bf400bfc028bec5e259317f03a5f52431184c86a901f8 MISC metadata.xml 463 BLAKE2B 9bcd092b61568f5d467230617b101f36245c41078e6a66c7ff63b22a6b4095de2ba3a59e48ce8b7842ce58d1255fa293995652daa3fab4c3af988498eaa30e97 SHA512 2ba5e340b59e0de4e472380e9c19b1f6f573e86e5c3c2e075f6151d369e94eea70e3ce36bfb5ece4da3fa69459e3ff83368f1df8302aa5754ae52f13c8f2312e diff --git a/dev-python/lxml/lxml-4.9.2.ebuild b/dev-python/lxml/lxml-4.9.2.ebuild index 6d7db7480919..a295574d4d4a 100644 --- a/dev-python/lxml/lxml-4.9.2.ebuild +++ b/dev-python/lxml/lxml-4.9.2.ebuild @@ -37,6 +37,7 @@ RDEPEND=" " BDEPEND=" virtual/pkgconfig + <dev-python/cython-3[${PYTHON_USEDEP}] >=dev-python/cython-0.29.29[${PYTHON_USEDEP}] doc? ( $(python_gen_any_dep ' diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest index f390f1afdaf1..c54f39dd4147 100644 --- a/dev-python/multidict/Manifest +++ b/dev-python/multidict/Manifest @@ -1,3 +1,3 @@ DIST multidict-6.0.4.gh.tar.gz 58931 BLAKE2B 2cf25ac2af57289432dfc6617f35a9f1310469b8d7b6a762e63f4f08b3cb8235c7115c4072fc2ffeec417b49af8a97654c7d69e8e20507fd553fab074e42b1cf SHA512 6f9e6ff16a104d40b0cb59860af9cb1a98e8d3a256626f77600c4895e6ef692b31880273f204e7ecdeb574407dd7c2e4326ad7cd9c08b1095011d6ba3793b86e -EBUILD multidict-6.0.4.ebuild 853 BLAKE2B 4db03e4422baf633ec6befafdcde755bc287a6fff89ec9886d894fd72cae3f5f007532b458382f5aafeb09261a7f15fb900ad44bdf51ee8d3c1375b979403e4d SHA512 44388de05125bfaab5b4d8bc0c4353dae01f110c3e281f603c6cdcb39a2b62aaca0067ca38b67e25040a2f67ac8004b52ec87cd1ea988cd6ace0de858e4c5733 +EBUILD multidict-6.0.4.ebuild 795 BLAKE2B f9f27f9ddc6a54afc3c573def69d5c2dcb601723486fb04ae935293b661155e52937e0460375369b024a432b01802f58648bc4e26365aa16c163d35dfa31ce66 SHA512 b4093ddcbe498a4dd0f0c5c23b87455e412ce7e1816643b9d90eefdd51d5daebc84f3080c737122da27a2a29c019b09a04240f187ecf0b312fd2ed4e8815bff4 MISC metadata.xml 476 BLAKE2B 4cc6b7b2d709459ddec7c0eace1cf5dc418a0953746816135ac5ad3d8a8aba4c5086ce13b4282326de9ec9db9ffb88eec7612748bdfaf29059252f97fd56692a SHA512 88215f090cf407903b6de7139c9dca5892f58111c8d1da9b52e91b4dac18fe212140868a05ec5ffa2231519f062b4499a25b05e99eef1a81bb9655ea61387338 diff --git a/dev-python/multidict/multidict-6.0.4.ebuild b/dev-python/multidict/multidict-6.0.4.ebuild index 1bd1f6761430..a6f0bd14da1b 100644 --- a/dev-python/multidict/multidict-6.0.4.ebuild +++ b/dev-python/multidict/multidict-6.0.4.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 @@ -23,10 +23,6 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" -BDEPEND=" - >=dev-python/cython-0.28.4[${PYTHON_USEDEP}] -" - distutils_enable_sphinx docs --no-autodoc distutils_enable_tests pytest diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest index e0f0e385e0ca..e31ff5e060f2 100644 --- a/dev-python/pexpect/Manifest +++ b/dev-python/pexpect/Manifest @@ -4,5 +4,5 @@ AUX pexpect-4.8.0-sphinx-3.patch 761 BLAKE2B 609849b3587cd5eeada58ba5065111f3d5d DIST pexpect-4.8.0.tar.gz 157037 BLAKE2B 742642bd6b9ec3f6cdfad054d4fd22db56b4a55b746d675c27a8cdf824ea749ec4589e296dffa08778195f3ccd20feb56bc0fd5212984396ea5aa0555c41ca96 SHA512 7447ae2d1e13be422c894a8fd51c5aaa788e37ea7f0c798c88b77afd401fb3631400a637077ccbb83c2e3876b0d0c5e1dbd5fdc9d3739d785b4d5ad7c0192580 DIST pexpect-4.8.0_p20230402.gh.tar.gz 169420 BLAKE2B 4780621f5876506c5ad2dbf03656d8c336d5aadef99b1ae99e841b5d0a945ab54177cb04a79b526e422cd4df7393c723000e4a28960bd5f57a5e0173b0a3bc69 SHA512 72cdf226ec5c7d60a10fbcecf81cd1ae422467652e104bb818908bf6d1a4a4bcadab9a06d58475a9609580d973956e18e2ab144ab13a0b700072474ff3087259 EBUILD pexpect-4.8.0-r3.ebuild 1186 BLAKE2B 4d24df6d44b889ab76ea51bdfc41541a6e229220abc1d98fb723aa61961f7f57784e100ed8e17d48f29646ca9046a638c3de654b049a7c93868d09e6b6d64b26 SHA512 c15328432614ee90f8e80e9fb7467cc6235e7e45c7a04fcdcb7c84ea70c91a05cb55136d80279fec6e0d74950c3b9bd01fdcdafe60ad424eaf344fa80f917912 -EBUILD pexpect-4.8.0_p20230402.ebuild 1251 BLAKE2B 675adc4b5abb8675c41d4f3c85e95df16a94067c02d46574ef224dc398f5f4b5329000609a9937eb88644383348faa6be84af670e035f5f4d9292b5de8d646ef SHA512 3fbe4022357e7e504cf7d25a633ef024e37faf78478aa0429c8323e2b02a0dc356b0229125d933a4dcfd08c6b9d747c0344931d225dd145a2ae2c47f1b99062d +EBUILD pexpect-4.8.0_p20230402.ebuild 1290 BLAKE2B 0d739f17544639eb17113263699dd70daecb43ecf759ddd7af963684f0a3e4d047722c1f12fe20d32de9541ef7a42e282cc10e33d631a61c40dfc2af38fc4a80 SHA512 9ccf6f1bccaa7a83fa9121564a81df7e8525b764b603af2979b04cf7424c57c551cefd7d51f55c86f5fa97fd93a102a1be219e6e6b72eba8ad38b2d0dddc8f7a MISC metadata.xml 403 BLAKE2B 0e07f64f32ee9f6776e53f5e59b91e0e22675ebb0e8c8b98eadfb9a46d29af3e7daaafbf4e60fd7fa20bf57d42619ebdf26994b087ed0773a943acd6fddc8ab4 SHA512 4c3e18b98b69213899a6af8366ade2ebfaa4eabef76f880cd71c300b03fc7725246200bc00491942b3f7b4b4f87bdfbc9181663fe5c8b7c5325f1e7c6e76356d diff --git a/dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild b/dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild index 5d6eb118364b..8d8caccb6973 100644 --- a/dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild +++ b/dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild @@ -33,7 +33,8 @@ RDEPEND=" " distutils_enable_tests pytest -distutils_enable_sphinx doc +distutils_enable_sphinx doc \ + dev-python/sphinxcontrib-github-alt src_test() { # workaround new readline defaults diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest index d735766e406b..50aa71567105 100644 --- a/dev-python/pyyaml/Manifest +++ b/dev-python/pyyaml/Manifest @@ -1,3 +1,3 @@ DIST pyyaml-6.0.gh.tar.gz 119855 BLAKE2B 286678ac81f2e6c252d285d2f98dab98894787e3aa164a29a697986f56200c7b71b0a768edf6d50e61065efcd054078673270872162a4975409928d7dd67aacc SHA512 cbcacc3560a035e2082867e93a9733f8660ea4c7f60573d07642f33a5453dcdc88d67299c3bcb97c27b843202a45d40de7444eb5e815bd4955129c9fc8ae04ad -EBUILD pyyaml-6.0-r1.ebuild 1022 BLAKE2B f7f4709ceb2ffd28271d03223acd301b2b7394d04bfde34f952c44f7a24696845dcdd032ecdcec63a0dddff93859f20a28be97c8e85d1f6b9b4e8f3145224c5f SHA512 074f8a1ef062e6459499cbfdffa070fad6ae6bc19ad9f3843682fa87056101d731c24fa44c98918b5ccda2f6cfef99462bf6c9884242663fd16f022c7d607351 +EBUILD pyyaml-6.0-r1.ebuild 1025 BLAKE2B afe29b5719a4d134ee5996c2960376231a1af58a7143400a9c6a3661cec525c45316e71d3a2871f75417ced75f67facccc1cc2884d8b2fd7379a47be0e983df8 SHA512 9a651e1fa1cfd40ddb364ac887e357c7153723faa2ddce87036f7618e7d49edcd18001f46e726de03b12b2d3ffc10f0955c0296a71420d819229f9462847e296 MISC metadata.xml 426 BLAKE2B 6216e38c3e79e811aced6c777b49779953abf4f1b0a1185947f6a6fdc851fdf4cc973092024a6cb2d76bf06863feb49742c7a6892a8761b48a5e74902757a610 SHA512 f549b70fcf1588625fcc2bc33ad0c41faa267ad5bb84d564f5502dee1ad2340a663d1a2b92cf9fdeed827a5f7cebdbe76d59166e89de6d03e7933141029c051d diff --git a/dev-python/pyyaml/pyyaml-6.0-r1.ebuild b/dev-python/pyyaml/pyyaml-6.0-r1.ebuild index c986d11df372..ca0a54273533 100644 --- a/dev-python/pyyaml/pyyaml-6.0-r1.ebuild +++ b/dev-python/pyyaml/pyyaml-6.0-r1.ebuild @@ -32,7 +32,7 @@ RDEPEND=" ${DEPEND} " BDEPEND=" - dev-python/cython[${PYTHON_USEDEP}] + <dev-python/cython-3[${PYTHON_USEDEP}] " distutils_enable_tests setup.py |