From 67c78fc4ac5b7eada5a0196fa051b16628dac90c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 29 Oct 2023 15:34:19 +0000 Subject: gentoo auto-resync : 29:10:2023 - 15:34:19 --- dev-python/Manifest.gz | Bin 269647 -> 269645 bytes dev-python/agate-sql/Manifest | 6 -- dev-python/agate-sql/agate-sql-0.5.9-r1.ebuild | 40 ---------- dev-python/agate-sql/agate-sql-0.5.9.ebuild | 38 ---------- dev-python/agate-sql/agate-sql-0.6.0.ebuild | 38 ---------- .../files/agate-sql-0.5.9-sqlalchemy.patch | 75 ------------------- dev-python/agate/Manifest | 4 - dev-python/agate/agate-1.7.1.ebuild | 44 ----------- dev-python/agate/agate-1.8.0.ebuild | 44 ----------- dev-python/braintree/Manifest | 3 +- dev-python/braintree/braintree-4.23.0.ebuild | 7 +- .../braintree/files/braintree-4.23.0-py312.patch | 81 +++++++++++++++++++++ dev-python/confusable_homoglyphs/Manifest | 4 +- .../confusable_homoglyphs-3.2.0-r2.ebuild | 26 +++---- dev-python/doc8/Manifest | 2 +- dev-python/doc8/doc8-1.1.1.ebuild | 2 +- dev-python/docker/Manifest | 2 +- dev-python/docker/docker-6.1.3.ebuild | 1 + dev-python/graph-tool/Manifest | 4 +- dev-python/graph-tool/graph-tool-2.58.ebuild | 2 +- dev-python/graph-tool/graph-tool-9999.ebuild | 2 +- dev-python/pythran/Manifest | 2 +- dev-python/pythran/pythran-0.14.0.ebuild | 7 +- dev-python/sphinxcontrib-trio/Manifest | 2 +- .../sphinxcontrib-trio-1.1.2-r1.ebuild | 23 ++++-- 25 files changed, 129 insertions(+), 330 deletions(-) delete mode 100644 dev-python/agate-sql/agate-sql-0.5.9-r1.ebuild delete mode 100644 dev-python/agate-sql/agate-sql-0.5.9.ebuild delete mode 100644 dev-python/agate-sql/agate-sql-0.6.0.ebuild delete mode 100644 dev-python/agate-sql/files/agate-sql-0.5.9-sqlalchemy.patch delete mode 100644 dev-python/agate/agate-1.7.1.ebuild delete mode 100644 dev-python/agate/agate-1.8.0.ebuild create mode 100644 dev-python/braintree/files/braintree-4.23.0-py312.patch (limited to 'dev-python') diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index cc87d95d459e..70aff6976ce5 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/agate-sql/Manifest b/dev-python/agate-sql/Manifest index e8cee6d2ae5f..f6778cec2abe 100644 --- a/dev-python/agate-sql/Manifest +++ b/dev-python/agate-sql/Manifest @@ -1,9 +1,3 @@ -AUX agate-sql-0.5.9-sqlalchemy.patch 3565 BLAKE2B 97b1846e0b825c4fd4ac38e6eb773525be4c6be80b38f05d965177d21bd4744519a75282b90a9d78dc524a3f65a0c34cd9bb2d0a85d5bcea8a76844ed2ba2be8 SHA512 8124f08c2087aabfbe231d353c2eeda290c1bfe33c6f6137cadeabcc144168e8295ad492815fe4143bc64c11ea14a02556a243ac93389bcfaccd8e152cffc025 -DIST agate-sql-0.5.9.tar.gz 15434 BLAKE2B 4825bfc5d0f78e0cd1bf318fe8797bfe03deaff1ffc962e0f082128af9d05afad97b7488d66b76d59411eb5dd889229be1fe05cf5bf55db4084f3451b21440b2 SHA512 482f257bb16e142d9380b9ae7590f50909639729e229271843686d6316ebfba0e77daac47e809b7aad4ef89d6c3810382d0b6817a418406bf73f13e266e5bcca -DIST agate-sql-0.6.0.tar.gz 13942 BLAKE2B c7940274a8625585fa92c81fdd1d2e2f53e76db3b14620e406df7609057482f8641cfcf20a486bf6f8db381362ee367b4dad9b6a7f04909f5cba4c491d01fde9 SHA512 74e90dad3776f817e92ded312cdf87c78754e9a3b5611a681a4a85d7a8357577a9e4dbb70b453c589417990f3f0a04195a8b0076fd03a1e2012b82893208b824 DIST agate-sql-0.7.0.tar.gz 13488 BLAKE2B 1064747f1f2a11f788c0828123ae3532ffd0aa6b32aa423b877e350e35e4231c21e73226920110ad9369b0b583167e47357acf456607e75e0ad9d5027e265c9c SHA512 6a29bcb19cac6e80a6df8ad51c06838fa4c48a1e5b207a55f7ebaf3b7af1afd56fad61c560f4c7a11da24e9460ab0a8ea6d9459309e05ac162f3ddd3737bb868 -EBUILD agate-sql-0.5.9-r1.ebuild 847 BLAKE2B f2f1ff98f2d876353f74d0e563f448425d945b3df5b867ee662dfe6f303df3f55966a9da68a743ffa2a21d502f8fd66717b3f23e54926aaf68a68be6c1411f13 SHA512 2a71717220b7dfac06139526ced91d8c0135da0fdd8119b2b0fd540b2fc7647a6edae828819ff3cd2999da70db0181285634612fd0e02f763b250bee2a678e15 -EBUILD agate-sql-0.5.9.ebuild 786 BLAKE2B 7e090d37390a6b2926198eb6f5fa96941f4ec536bc066e1fffbdddb1bb9edd8b99efd50bb05746c3ca888ffbb34d04c26ccb016c36406d6990e4558a02f3b04e SHA512 6a6a99e9667180cef8c0f7d5ea229d2c1d039978b05dcb7de65c879725743537423a2fb8e98190f88c358089125cd8dd713c49aa55235c13366c06d59f29d71c -EBUILD agate-sql-0.6.0.ebuild 790 BLAKE2B e15cce0203a7e7a23d660c40202752f4c271682f2869b8f3acbd36e8f370a4c996ee4b79025be4a913643a4315f03a850b53e8a7a8d30499fa4b71bb6762289d SHA512 f604bc1e5dd7e9122762a23d4a32219715308917d6b49d5e3b861b65f4a5d914ba9df3fadd22309fedb10fa68349f77093b927937657654624d9334c2894c698 EBUILD agate-sql-0.7.0.ebuild 790 BLAKE2B e15cce0203a7e7a23d660c40202752f4c271682f2869b8f3acbd36e8f370a4c996ee4b79025be4a913643a4315f03a850b53e8a7a8d30499fa4b71bb6762289d SHA512 f604bc1e5dd7e9122762a23d4a32219715308917d6b49d5e3b861b65f4a5d914ba9df3fadd22309fedb10fa68349f77093b927937657654624d9334c2894c698 MISC metadata.xml 638 BLAKE2B aa62813cba6c3eb26352e63e05a9a5e00817049dec03befd4df97c6f7b1a01bc142440813c8ad5a67cdebc0e3cb72a8d272f96a59758547709bca11131092cee SHA512 916aea41b52015c5d57d052fc9908dc711a3e600b585dbb92f604846af9222243b7acddb04042e67567aefc9d7d976a69bbecf10e328691e04ac028dc58c5a08 diff --git a/dev-python/agate-sql/agate-sql-0.5.9-r1.ebuild b/dev-python/agate-sql/agate-sql-0.5.9-r1.ebuild deleted file mode 100644 index b74f616a7459..000000000000 --- a/dev-python/agate-sql/agate-sql-0.5.9-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{9..11} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Adds SQL read/write support to agate" -HOMEPAGE=" - https://github.com/wireservice/agate-sql/ - https://pypi.org/project/agate-sql/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64-macos ~x64-macos" - -RDEPEND=" - >=dev-python/agate-1.5.0[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/greenlet[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - ) -" - -PATCHES=("${FILESDIR}/agate-sql-0.5.9-sqlalchemy.patch") - -distutils_enable_tests pytest - -EPYTEST_DESELECT=( - # requires crate - tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_dialects -) diff --git a/dev-python/agate-sql/agate-sql-0.5.9.ebuild b/dev-python/agate-sql/agate-sql-0.5.9.ebuild deleted file mode 100644 index 7d0761c8198b..000000000000 --- a/dev-python/agate-sql/agate-sql-0.5.9.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{9..11} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Adds SQL read/write support to agate" -HOMEPAGE=" - https://github.com/wireservice/agate-sql/ - https://pypi.org/project/agate-sql/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64-macos ~x64-macos" - -RDEPEND=" - >=dev-python/agate-1.5.0[${PYTHON_USEDEP}] - -Date: Tue, 26 Sep 2023 11:59:39 +1000 -Subject: [PATCH] Migrate to SQLAlchemy 2 - -https://github.com/wireservice/agate-sql/pull/40 - -Remove the upper bound on SQLAlchemy by converting the code idioms in -use to support both SQLAlchemy 1.4 and SQLAlchemy 2, and only setting a -lower bound SQLAlchemy of >= 1.4. - -Closes #39 - -diff --git a/agatesql/table.py b/agatesql/table.py -index b141937..e4efe91 100644 ---- a/agatesql/table.py -+++ b/agatesql/table.py -@@ -82,2 +82,2 @@ def from_sql(cls, connection_or_string, table_name): -- metadata = MetaData(connection) -- sql_table = Table(table_name, metadata, autoload=True, autoload_with=connection) -+ metadata = MetaData() -+ sql_table = Table(table_name, metadata, autoload_with=connection) -@@ -113 +113 @@ def from_sql(cls, connection_or_string, table_name): -- s = select([sql_table]) -+ s = select(sql_table) -@@ -182 +182 @@ def make_sql_table(table, table_name, dialect=None, db_schema=None, constraints= -- metadata = MetaData(connection) -+ metadata = MetaData() -@@ -276,2 +276,3 @@ def to_sql(self, connection_or_string, table_name, overwrite=False, -- if overwrite: -- sql_table.drop(checkfirst=True) -+ with connection.begin(): -+ if overwrite: -+ sql_table.drop(bind=connection, checkfirst=True) -@@ -279 +280 @@ def to_sql(self, connection_or_string, table_name, overwrite=False, -- sql_table.create(checkfirst=create_if_not_exists) -+ sql_table.create(bind=connection, checkfirst=create_if_not_exists) -@@ -282,13 +283,14 @@ def to_sql(self, connection_or_string, table_name, overwrite=False, -- insert = sql_table.insert() -- for prefix in prefixes: -- insert = insert.prefix_with(prefix) -- if chunk_size is None: -- connection.execute(insert, [dict(zip(self.column_names, row)) for row in self.rows]) -- else: -- number_of_rows = len(self.rows) -- for index in range((number_of_rows - 1) // chunk_size + 1): -- end_index = (index + 1) * chunk_size -- if end_index > number_of_rows: -- end_index = number_of_rows -- connection.execute(insert, [dict(zip(self.column_names, row)) for row in -- self.rows[index * chunk_size:end_index]]) -+ with connection.begin(): -+ insert = sql_table.insert() -+ for prefix in prefixes: -+ insert = insert.prefix_with(prefix) -+ if chunk_size is None: -+ connection.execute(insert, [dict(zip(self.column_names, row)) for row in self.rows]) -+ else: -+ number_of_rows = len(self.rows) -+ for index in range((number_of_rows - 1) // chunk_size + 1): -+ end_index = (index + 1) * chunk_size -+ if end_index > number_of_rows: -+ end_index = number_of_rows -+ connection.execute(insert, [dict(zip(self.column_names, row)) for row in -+ self.rows[index * chunk_size:end_index]]) -@@ -354 +356 @@ def sql_query(self, query, table_name='agate'): -- rows = connection.execute(q) -+ rows = connection.exec_driver_sql(q) -diff --git a/setup.py b/setup.py -index 3905203..7257399 100644 ---- a/setup.py -+++ b/setup.py -@@ -37 +37 @@ setup( -- 'sqlalchemy<2', -+ 'sqlalchemy>=1.4', diff --git a/dev-python/agate/Manifest b/dev-python/agate/Manifest index a08f035eb55d..3053b239e3de 100644 --- a/dev-python/agate/Manifest +++ b/dev-python/agate/Manifest @@ -1,7 +1,3 @@ -DIST agate-1.7.1.tar.gz 202018 BLAKE2B 9df0f108f1ac47c1eb199015aedc903d72ce62a7d2c34198f0f287863527a2305c5682ef7dd385d130fd0eb3ce566e98978b9ef438858510e3aeae02a6345318 SHA512 e40df26f1e738b4c386f540d642f4fdb240dac5229032c6074977a67c7fdae7838c770703d93916e10741a9f2569ac9672165f8c8715b2567b2e5b926c7dabd5 -DIST agate-1.8.0.tar.gz 201730 BLAKE2B c0138f912d6981059b8cd62424bdb428c9b6bff566bc47466bea9f0fd78f100333583dddaf081ea2f9810e8a1e586d4697960141ea4e97e8cef4a5084f09ce78 SHA512 9870f31f87efcb057947cf0c93062c2dbfa2aa996d1e6d69c552935eca3ab5c047ea0cbdf2eaca8e37d2a0530d210318fd342324f1ce43d7cba9f6291206f6fb DIST agate-1.9.0.tar.gz 202237 BLAKE2B f4a6609f843b0b0499b44c6596c186198e2d6a0c964727fbd3d3fa69bd6164a067384354e3426a0276f91fc3b6f2d1fc86e05e4d4be974d1f2c223b20cb5a6b3 SHA512 bbd05b503d27e34625cebba71c0d3a1362bf63c45a3ce7c327fb73f0730b739fe8f9bf780c37c4e1a0e70c9d263d9191946fa6b70c147c0761a43ed479ae7fed -EBUILD agate-1.7.1.ebuild 1133 BLAKE2B e4eebdadb1598214cd15244bab87622b16a1afd8248ef5c8b1ebcfe96fe96defca6a436b52bdca7a8b91cceef74910604cb36222eba9a6022c060f9efe9b0dd5 SHA512 ea1287f7bfff8eb835309ec03c9518e0f7fddaef28a77656ba66a94b450b661fa2c3621593766c001f7c141103c99141a5b7951e847717c3a4e52a91e6d12293 -EBUILD agate-1.8.0.ebuild 1122 BLAKE2B 3e4bd01a37455a15a741bc3ad35767186f84c88b2fd7ae703eda57d52941fdd75e899bb4e9c26ea894329748c6a960eef78870c450db69eb68111ef2049811a4 SHA512 a7ccbad1830c0b74c1b97d6db4910f425afb554b608ee8d7f7a6eb978db9361e4957ee7df9b54adc8a36777efca19f058720a9b4855828b3a7eb8ac6bffb0d30 EBUILD agate-1.9.0.ebuild 1122 BLAKE2B 132c0330575fc14b1e2a53226e2bee2e9ed1f12671240086f9131e4ce56d058e77d869331290c0b31010a192caa16dfb5b4f5535e1ec4343a170423de9c4091b SHA512 1513168608d9009b0aa324e8d8b8e05bf363e844f5535aedbed9cc35e270db5a64c90b1d2421dd3034b579100ba50670a3992e31f83239f929c7ef1f70c5eb86 MISC metadata.xml 611 BLAKE2B a288b63c7859d99467f9304b4d8b007b9df6b4345157e3b7363f23757797fa7f84420b8a515f754775de14893c2fba1ddd62fc3757f5b96f791f65b524db41f7 SHA512 3101db1d600b60da2704dd732b898db6d932ef2305a28dbfdc8b221fc7938a72309e1fd27af4567b4930a20f00490ad8d65bd962978df44cf401ddd058442f02 diff --git a/dev-python/agate/agate-1.7.1.ebuild b/dev-python/agate/agate-1.7.1.ebuild deleted file mode 100644 index 8f58a4dec687..000000000000 --- a/dev-python/agate/agate-1.7.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) - -inherit distutils-r1 pypi - -DESCRIPTION="A Python data analysis library that is optimized for humans instead of machines" -HOMEPAGE=" - https://github.com/wireservice/agate/ - https://pypi.org/project/agate/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~riscv ~arm64-macos ~x64-macos" - -RDEPEND=" - >=dev-python/pytimeparse-1.1.5[${PYTHON_USEDEP}] - >=dev-python/parsedatetime-2.1[${PYTHON_USEDEP}] - >=dev-python/Babel-2.0[${PYTHON_USEDEP}] - >=dev-python/isodate-0.5.4[${PYTHON_USEDEP}] - >=dev-python/pyicu-2.4.2[${PYTHON_USEDEP}] - >=dev-python/python-slugify-1.2.1[${PYTHON_USEDEP}] - >=dev-python/leather-0.3.3-r2[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/lxml[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest -distutils_enable_sphinx docs \ - dev-python/sphinx-rtd-theme - -EPYTEST_DESELECT=( - # require specific locales - tests/test_data_types.py::TestDate::test_cast_format_locale - tests/test_data_types.py::TestDateTime::test_cast_format_locale -) diff --git a/dev-python/agate/agate-1.8.0.ebuild b/dev-python/agate/agate-1.8.0.ebuild deleted file mode 100644 index bf35fa27a14c..000000000000 --- a/dev-python/agate/agate-1.8.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) - -inherit distutils-r1 pypi - -DESCRIPTION="A Python data analysis library that is optimized for humans instead of machines" -HOMEPAGE=" - https://github.com/wireservice/agate/ - https://pypi.org/project/agate/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~riscv ~arm64-macos ~x64-macos" - -RDEPEND=" - >=dev-python/pytimeparse-1.1.5[${PYTHON_USEDEP}] - >=dev-python/parsedatetime-2.1[${PYTHON_USEDEP}] - >=dev-python/Babel-2.0[${PYTHON_USEDEP}] - >=dev-python/isodate-0.5.4[${PYTHON_USEDEP}] - >=dev-python/pyicu-2.4.2[${PYTHON_USEDEP}] - >=dev-python/python-slugify-1.2.1[${PYTHON_USEDEP}] - >=dev-python/leather-0.3.3-r2[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/lxml[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest -distutils_enable_sphinx docs \ - dev-python/furo - -EPYTEST_DESELECT=( - # require specific locales - tests/test_data_types.py::TestDate::test_cast_format_locale - tests/test_data_types.py::TestDateTime::test_cast_format_locale -) diff --git a/dev-python/braintree/Manifest b/dev-python/braintree/Manifest index 1c0126387859..43b5df326f91 100644 --- a/dev-python/braintree/Manifest +++ b/dev-python/braintree/Manifest @@ -1,3 +1,4 @@ +AUX braintree-4.23.0-py312.patch 3071 BLAKE2B 827df33cf30a5bfb8c233fbada4fbe9e06ccb5952d68e20f71b781d62bd79ab3a8fea46555c7df3d0c6679ec324e203ea78a295b2f23723e1ff8c7e59afd8842 SHA512 add39a785694faeb2ef7bf6e7e25aeb7d7f89f006919ba3294aad4978b0d23949e438303472d1474824ed328b932010be9d24326aaee07cb7feff0fb3633ac82 DIST braintree_python-4.23.0.gh.tar.gz 220576 BLAKE2B 23d158c0216a63ce7746a521c339663dc4f1fcc355f3cf65d526c19f7b6a29e49da6a8905059a1410bcf0390c7d44bc267963d68e44e5f4ddc0de57b2500c06f SHA512 e5be83985a6605e68317eafa7533e826d3965707e691791a045f1cbeddded718b21d62e5156c402142228742b13de9859e586b4236865ea675c5c57a3410ffb3 -EBUILD braintree-4.23.0.ebuild 793 BLAKE2B 47195a75604a7c00b3a29d41f11242b0ca4015130e01792ae6317510d2fe7098656f941e3132ffb8335fbb48ff11b3ec24b5ee1cc040be38bbdba48f4c1c09a9 SHA512 3d61c2c378cceddbad9f1317f36de0454b5eccc496bf5ec151a55817cf18f2572e2b1d63f2630212a7dc62cb7d5a125620758249b2f3fda3ab3af5089e994a23 +EBUILD braintree-4.23.0.ebuild 896 BLAKE2B a9112a658e1329ae3a33e72fb3e7096b28b14785f02a3418c0c1202de8d1428ac0703a6de9708f2edbc3fd81b8900f0aba445375b731c7e887cadf6d7504a810 SHA512 cff9fbe2f2063a30505c07702e88dda69988f3798fee24b4205ea1dfe6792e9c5a85afea74896eddec3bd2b4a1786c77e87844babc7d35077837086ea4738914 MISC metadata.xml 484 BLAKE2B 17a5993a7630126f55e88b92bf917ae068282c36813ea739407b65d91542d2a9977f3057889838bce776b38c5e64e4a17fabc3367ac01ae8512d06897de1a060 SHA512 c0f5406afc289683369998c79009defdd07735e6aaf60d777e524eee6c58dbaff4b936e990490cd15cd53f175accbfb3adbe55896511c79e9655f08bda24ba49 diff --git a/dev-python/braintree/braintree-4.23.0.ebuild b/dev-python/braintree/braintree-4.23.0.ebuild index c50e26d97b9e..06d433d74228 100644 --- a/dev-python/braintree/braintree-4.23.0.ebuild +++ b/dev-python/braintree/braintree-4.23.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 @@ -34,6 +34,11 @@ DOCS=( README.md ) distutils_enable_tests unittest +PATCHES=( + # https://github.com/braintree/braintree_python/pull/154 + "${FILESDIR}/${P}-py312.patch" +) + python_test() { eunittest tests/unit } diff --git a/dev-python/braintree/files/braintree-4.23.0-py312.patch b/dev-python/braintree/files/braintree-4.23.0-py312.patch new file mode 100644 index 000000000000..4ecbd9e555dd --- /dev/null +++ b/dev-python/braintree/files/braintree-4.23.0-py312.patch @@ -0,0 +1,81 @@ +From 9fbdf874ef6a6874db5e98cb2c93ab9736810d4e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Sun, 29 Oct 2023 11:18:56 +0100 +Subject: [PATCH] Fix test suite compatibility with Python 3.12 + +Replace the deprecated `unittest.TestCase.assertRaisesRegexp()` method +with `assertRaisesRegex()`. The former is no longer present in Python +3.12, while the latter is available since Python 3.2. + +Replace the deprecated `imp.reload()` function with +`importlib.reload()`. The former module is no longer present +in Python 3.12, while `importlib.reload()` is available since +Python 3.4. + +With these changes, unit tests pass with Python 3.12.0. + +Fixes #153 +--- + CHANGELOG.md | 3 +++ + tests/unit/test_client_token.py | 2 +- + tests/unit/test_configuration.py | 6 +++--- + 3 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/CHANGELOG.md b/CHANGELOG.md +index 56e4373..792ee9c 100644 +--- a/CHANGELOG.md ++++ b/CHANGELOG.md +@@ -1,5 +1,8 @@ + # Changelog + ++## 4.24.0 ++* Fix unittest compatibility with Python 3.12 ++ + ## 4.23.0 + * Deprecate `evidenceSubmittable` in Dispute + * Add missing `escape` calls in `generator` for: +diff --git a/tests/unit/test_client_token.py b/tests/unit/test_client_token.py +index 7216a6b..74eb8a2 100644 +--- a/tests/unit/test_client_token.py ++++ b/tests/unit/test_client_token.py +@@ -3,7 +3,7 @@ from tests.test_helper import * + class TestClientToken(unittest.TestCase): + def test_credit_card_options_require_customer_id(self): + for option in ["verify_card", "make_default", "fail_on_duplicate_payment_method"]: +- with self.assertRaisesRegexp(InvalidSignatureError, option): ++ with self.assertRaisesRegex(InvalidSignatureError, option): + ClientToken.generate({ + "options": {option: True} + }) +diff --git a/tests/unit/test_configuration.py b/tests/unit/test_configuration.py +index cf82831..5b24540 100644 +--- a/tests/unit/test_configuration.py ++++ b/tests/unit/test_configuration.py +@@ -1,13 +1,13 @@ + from tests.test_helper import * + import braintree + import os +-import imp ++import importlib + + class TestConfiguration(unittest.TestCase): + def test_works_with_unconfigured_configuration(self): + try: + # reset class level attributes on Configuration set in test helper +- imp.reload(braintree.configuration) ++ importlib.reload(braintree.configuration) + config = Configuration( + environment=braintree.Environment.Sandbox, + merchant_id='my_merchant_id', +@@ -21,7 +21,7 @@ class TestConfiguration(unittest.TestCase): + finally: + # repopulate class level attributes on Configuration + import tests.test_helper +- imp.reload(tests.test_helper) ++ importlib.reload(tests.test_helper) + + def test_base_merchant_path_for_development(self): + self.assertEqual("/merchants/integration_merchant_id", Configuration.instantiate().base_merchant_path()) +-- +2.42.0 + diff --git a/dev-python/confusable_homoglyphs/Manifest b/dev-python/confusable_homoglyphs/Manifest index d0aa4aed3a59..41f9b368f377 100644 --- a/dev-python/confusable_homoglyphs/Manifest +++ b/dev-python/confusable_homoglyphs/Manifest @@ -1,3 +1,3 @@ -DIST confusable_homoglyphs-3.2.0.gh.tar.gz 338272 BLAKE2B b4697ad3997ecb2784653a47779ead7ded0e9af46125bc5868954cc8cf5064377a553c9b388be6a42634fa27880ef2fa57224e4b4bf9e357b3a9ff32a5db4993 SHA512 6e51cc4ec9a70246f4a871b8303834d0189d9d5056823b2f576e198cc3ced7154a0d57e945f3814bfa37da6015808bc1d6cdf44cfa17d637ded83ead8a6e4f5c -EBUILD confusable_homoglyphs-3.2.0-r2.ebuild 819 BLAKE2B 5dde6c66ebb63023fb9bf1f4dec6247f3d9fc1d862ec81ad29abbb5c9460aba6a1a6c697cf6622360df244fb6439a267e2d260a0595fe339107d7aedbdca319d SHA512 137f84ef9dd5c4e989733dfd4a74caa3a8f931f78f38480ec79971291a605b78722651cef54416d8ed8c13cbe2abdd18638f55fdbe4b00db026324136e111ca4 +DIST confusable_homoglyphs-3.2.0.tar.gz 161937 BLAKE2B ac2c66317b18dd73868b3cbe3b11162550597547da8ee3df5525362b79bd7f61a19bd7446839dfb477d5c2b27464fc88a120c5c6d496de8b86c9e88aabd8aeb0 SHA512 0a46a5bc94393592f6fa088bbe2f95cc301972c55de08231f3607828fcd3c5cb462514b80013283ef8cd8d76eaa3e14258ac8f3433c9c2cd1a89bcebca8fa7f6 +EBUILD confusable_homoglyphs-3.2.0-r2.ebuild 700 BLAKE2B fa332bb95a7cb97b511309e4d44ca171b5b28166c7baaffb4a1d02424780536567e3391c56d3e03c654c055276195a311718f4597be701c1cfc78cac2d104ccf SHA512 2ef0ec93fb2f7465d8bedaa1fb37bdee74a0d3ede1e8b04f34cdc6859a9c2d937b3e3dc3bc06fc6d255a1b4f59cc2bcb8859c992818ce1e21c0885dbbed72e20 MISC metadata.xml 397 BLAKE2B fb2119e687bb411de4fb76a9fad0bf32aba1ec30275beb9ddd4a585842823f64c9f1b773dea1507243dbd10437794d0a7dd0e62a35a3d29f4712df4cd5e1f0bf SHA512 57eae9c159782afe8324775750a0591ba4f16216292ba4d831b17fc3d965fe5d7b46aa28e0674847d359799762775acf8c03ab5afe97d2697611d7ca3962d369 diff --git a/dev-python/confusable_homoglyphs/confusable_homoglyphs-3.2.0-r2.ebuild b/dev-python/confusable_homoglyphs/confusable_homoglyphs-3.2.0-r2.ebuild index a9190b96610a..5d7ef0d9fa24 100644 --- a/dev-python/confusable_homoglyphs/confusable_homoglyphs-3.2.0-r2.ebuild +++ b/dev-python/confusable_homoglyphs/confusable_homoglyphs-3.2.0-r2.ebuild @@ -4,33 +4,31 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 +PYTHON_COMPAT=( python3_{10..12} ) -CommitId=14f43ddd74099520ddcda29fac557c27a28190e6 +inherit distutils-r1 pypi DESCRIPTION="Detect confusable usage of unicode homoglyphs, prevent homograph attacks" HOMEPAGE=" https://github.com/vhf/confusable_homoglyphs/ https://pypi.org/project/confusable_homoglyphs/ " -SRC_URI="https://github.com/vhf/${PN}/archive/${CommitId}.tar.gz - -> ${P}.gh.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -RDEPEND="dev-python/click[${PYTHON_USEDEP}]" - -S="${WORKDIR}"/${PN}-${CommitId} +RDEPEND=" + dev-python/click[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-python/versioneer[${PYTHON_USEDEP}] +" distutils_enable_tests pytest -python_prepare_all() { - sed -i \ - -e "s:versioneer.get_version():\"${PV}\":" \ - setup.py \ - || die - distutils-r1_python_prepare_all +src_prepare() { + # removed outdated bundled version (for py3.12 compat) + rm versioneer.py || die + distutils-r1_src_prepare } diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest index 775a648371ff..cb3a7809abac 100644 --- a/dev-python/doc8/Manifest +++ b/dev-python/doc8/Manifest @@ -1,3 +1,3 @@ DIST doc8-1.1.1.tar.gz 26514 BLAKE2B 847e34081f4e00698cbe3ca9b7325de2995c45bd02b2f443459050a2801a5b476222c345c4ba06463fc6ff489c3c59e5b6e7abbd7b98af740f09d5b04771a4b2 SHA512 7ec21c2483f7ebf2a7e1fef6677c6051ac253da6014354a968b8a107d8097f986b6b162850561fd6a103e93d157b2c849554aabe2484a49c4a3726c8e2083a89 -EBUILD doc8-1.1.1.ebuild 791 BLAKE2B 04a035080d4653e04368c963941b322f40d801f024df4fa5f8a39b49582a9366828d880c176d3498ad29d683d62a7dae80e115b030ad353d96412171661e054f SHA512 eb9f31e2fcebee05ffda42be0bde5345c96af4d9385fb6c7bf8a32b3c56e8c147650d39f2373a9b48c410c3e23b269b1f02ea799a4e1e7a96c98f4f6dc6f2725 +EBUILD doc8-1.1.1.ebuild 792 BLAKE2B 5eb5d529d1bbd4d39e97ab6a0cd1071e22540921e6bfb28ba8ca97961edc7a3b07f7e59e89bb66f7de94887f2ef8d4f0f6f9e00ccd695d9617d274918be8b32e SHA512 a6776376dddf870f2fc090424aa8c6b5935e1759a00349aa888fa0be1571fa50528de27cd3c3d98da6b02ed1b4223285ae69bde534782191747948ef17949571 MISC metadata.xml 497 BLAKE2B 6e5c2f8a487d967892a471d045fcb0acfb2c4681375c352837820237110cfc8ea193c395730552cadeb09ca66316e91e99785aae821a184c619b32d7d8908b47 SHA512 a626b4ecc4cb4cdd2e0a095a2a26a3d0346e4c47608188fd6138517631d99a0f4c2e5ae8be453ac709dd43c2e4acc79b0ec7f37dd6e00125ebe23c99697658d0 diff --git a/dev-python/doc8/doc8-1.1.1.ebuild b/dev-python/doc8/doc8-1.1.1.ebuild index 10922b0b7e91..99524e85d3e3 100644 --- a/dev-python/doc8/doc8-1.1.1.ebuild +++ b/dev-python/doc8/doc8-1.1.1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 pypi diff --git a/dev-python/docker/Manifest b/dev-python/docker/Manifest index c26d167b1ed7..270e3cb1db52 100644 --- a/dev-python/docker/Manifest +++ b/dev-python/docker/Manifest @@ -1,3 +1,3 @@ DIST docker-py-6.1.3.gh.tar.gz 253192 BLAKE2B b5a54d2bcbb4a89e4861bbf59a9b4565886f5541a518f66691ae205b7581f73af9fe6d491af299b0295f39b4a6e6248871b16e25ea5650fabbeafb7ced6cdaf7 SHA512 ba6ade2487afb8f68606b7d78c0f0dc83ffde622444a9598a5c647d0176695171040c5d1115fb8db6d97cb062a24d552d043274a56923b0eae0f64d98cb92c30 -EBUILD docker-6.1.3.ebuild 1227 BLAKE2B fb084dc9cb38326ef8bd0de211821bef1e7b1f082215ede9aa89f52a6a12f7a8a6517d2a33c5186f35ccd25cf5689e9b94e545490656192834f1297585bca062 SHA512 affe3174accdb2219421d732270893065c5c90db123dcdb2143fa10bfce06e221b8ccc2dbcff83a77efac2013b1fed6b119b544d3bb930df5fbbcd4e25df925d +EBUILD docker-6.1.3.ebuild 1296 BLAKE2B 8d6fdc5b18eb425a08bf720ce93db42f664302e89c7cdb2fc6da96746103de4a7b129188775dbf0048a38877db9c67c89826c1a0a10e31ceaaae008cd7bcc76a SHA512 759c07eefc51f45b00ba49a76187429197da4c0a87b16e1ed33a4fde161f744780d7e88037af9ae1523c072dce011c453bd36cc1bcd7b31d98b2d312ad86a43b MISC metadata.xml 432 BLAKE2B d57abab67aa69fa94d65ad06263fd9aa748e9c918d51750b613b6a22fffbd3642c8b1e01ebf521edff10d082c9e41329b3234b981283e3ca8bb07ddee7f97dd5 SHA512 b7d9c322623a2e68902def06d10d8f2a3c18d231a36383b52f80001ef2a2161633a66950afd7ad60f07e5d666d15d1fab738e46fce42ab221ad2e1e0b2fb600a diff --git a/dev-python/docker/docker-6.1.3.ebuild b/dev-python/docker/docker-6.1.3.ebuild index 2176517410ae..6d94ceea49f3 100644 --- a/dev-python/docker/docker-6.1.3.ebuild +++ b/dev-python/docker/docker-6.1.3.ebuild @@ -4,6 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools +# py3.12: https://github.com/docker/docker-py/pull/3176 (incomplete) PYTHON_COMPAT=( python3_{10..11} ) inherit distutils-r1 diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest index 868a4bd77ccf..1f6a440c3475 100644 --- a/dev-python/graph-tool/Manifest +++ b/dev-python/graph-tool/Manifest @@ -1,5 +1,5 @@ AUX 0001-Fix-compilation-with-boost-1.83-and-boost-1.76.patch 789 BLAKE2B 6117f7f3dd0d2ec73ec2009f0cfce6721c6fbbfc5e50efdd23e220f26b135b7e31fbf645ed9fcde6d863631f6ad564ad58235cb26bcd8133c8e958334604862f SHA512 93766f3b8603f4d1b3af9c26f6fa01b4d2ffcc9290b05bcd7f213d9823f33ca4ebff52c385810416f2a0457e2dd05792f9e22f5fb983ddedb44c819cb7882910 DIST graph-tool-2.58.tar.bz2 15189499 BLAKE2B c3137df7e2c49bb453969f6355bda66090daaa993085ccffd0b055e6b6f55e5b7f13d851d860aaed08d961e47df360e88194cde6eced50a1d3e40701c9c823f2 SHA512 89d62c865ab7a2ade1fabf27fef3c74e7bc9fa85a25e3094941d9d7f1824dc2e426eae7a62660d57140c54bf6fefd07673ab9ec3a72ad05c63c84a7da9ba2ffa -EBUILD graph-tool-2.58.ebuild 1876 BLAKE2B 9f93d397b2755e8f5ea419b439e14fddd3d6fc88838c19cea981a8c041a6b592e1ad1d6911391c8cfcb6158885f5505a4e53dd9e8b6348586d79ebbe883707c8 SHA512 16a7e2d87e0ce946577a6cf1f93466267d1e55b67f836f29978a8384b7ebbde18cc11ee2988e6f6e6249567e0242ad7f3199ec188a24a039b3892cdcc3475bfc -EBUILD graph-tool-9999.ebuild 1779 BLAKE2B 315840f08af610ca504f6991bde321c330d6ccd33dfca56a75cf4a48b262054a2ed61260bf28b2b0e45211d943afd915a3cbeb3ac5725dfd9b77858e60681943 SHA512 146a006f916be5f9f234bb8e26fdca55df73d89956462d43f7afae45801bf99763915a1c9d89ca8164c20ed8ed770797029ec243994f24ce852ae20290550208 +EBUILD graph-tool-2.58.ebuild 1876 BLAKE2B 4f2b6aba76805c1763340524bd442d5fabb7d0a7cead5cf2ba07c6b4c11fc6bfb014c33f49a414ec90fa8d534fd60d34910e8363a7c119e6195c0e44a9891643 SHA512 d2dd07da2eb1a6e5a2fd62e40917ce37082cd5d8bd9787b6190cb7ba60edae99f99fbecb9a7f1cf59af633da2d7d119cf38562abc994906b4fb5bb680906b18f +EBUILD graph-tool-9999.ebuild 1779 BLAKE2B 92f985ca984b6a5a32456b6cbe100c327ae79c51600d7a77bab188aaf4b2327f6d31e6736abc42deae05c538a387ba443f8beeb6a6cb065f7825eeb142370e93 SHA512 33f57d1a814a9ce474d60bc0df38a96d7461fecf76c3bebcbbb8b430859e6a63e222d3e3c6338d060c65f5b93bc4a999cfe5af64a1dd3e347383e0b4e5cacf2a MISC metadata.xml 318 BLAKE2B f5a87067223b56a1c2f2a89278b2b7b8ab612a1575264999e40a3bb34853cf603a7a11546c7ff9aa4f253beeb09c2fd26abc8fda1c6f2de5bda35069e9f932bc SHA512 b3bf8fc36dd5ae8e8b773cf9a0670fa1c6a2ee3730c9f2980abf5823f52879c5ef87a357c25d025896bd75ced32ffcec82ecdb1f080babc4fe13d2a2b70624b1 diff --git a/dev-python/graph-tool/graph-tool-2.58.ebuild b/dev-python/graph-tool/graph-tool-2.58.ebuild index 1856ccadd94d..002fda98dac3 100644 --- a/dev-python/graph-tool/graph-tool-2.58.ebuild +++ b/dev-python/graph-tool/graph-tool-2.58.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit check-reqs python-r1 toolchain-funcs diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild index a856d2584fed..b61774538a69 100644 --- a/dev-python/graph-tool/graph-tool-9999.ebuild +++ b/dev-python/graph-tool/graph-tool-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit check-reqs python-r1 toolchain-funcs diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest index 9a019a635b20..47a3f4a0ea74 100644 --- a/dev-python/pythran/Manifest +++ b/dev-python/pythran/Manifest @@ -1,5 +1,5 @@ DIST pythran-0.13.1.gh.tar.gz 3639196 BLAKE2B 8aba73c68542d69dd2287d7081226161ecade9e49fe6ea69d034f9116becbc148614212cbcff0056291809d2994caf43ee374393939e44635c6bed69220b29b8 SHA512 2497fa49d78ff64e577816f4b48bd424c03f04b7605c92d359f0f8514aaa67b30b7e68248db475c215deafaf7e55f7b4b74ab37c9dbef2a27e813878bf350e77 DIST pythran-0.14.0.gh.tar.gz 3642431 BLAKE2B cd5eeca0c52b0c3d17862b38c176b435a63a1f399e66979b8ac2682625cd0b0e074265e79bfdb6e57db989633954266132752e9b50c601ff43ae5c17c3e34bf5 SHA512 2a485c00b015abafc9ded28bfea8d8a7ae3ce87b5b654c318d5514fe12fd9374b599c05e3c4a2ff911fbae84df2efaa3cec2019c91e82ac1f36e0cc5ddeb2d8e EBUILD pythran-0.13.1.ebuild 1715 BLAKE2B f598528124f74b15f338227974377062786e8f8884a1b0cf3cbdcbd6739607aaf05527b758c6bbaf32e758567fff4e8e9644a7c00e27bfb8927b0a0eeb1a2ebc SHA512 105f92ba63b854ff9b56462d046818930c9244d3257ad5c2f9d7cb54f5f02b51c89ddfd4bd0e91c38b6ce9b556ddd7aa8bcfc20bea612351327eb6d9576b22b2 -EBUILD pythran-0.14.0.ebuild 2483 BLAKE2B 164170465ba96d92643edc294f1276f8a8114968659c97939f29bcc93cd40e422a42c0c9cd2357777c23af91c33540a857ac83f358363447f7d57cf59824af45 SHA512 5f9073babdb1019e03d4a5a98d7ee758797f9d27d39c25278dcb79cd3665efe3ff254a2ed853b6359eed3801c69fd8ca22289e10ddc63f79ad9e5a4462c416a2 +EBUILD pythran-0.14.0.ebuild 2065 BLAKE2B 09f565346654d789fb31d14afa91543c292ef240bbbb5428dce62afcebeeeb36889209367f2f4c9dc5e1efcc5ca51f69097d6e498b67e08e85d64ff06c7e8874 SHA512 4063f56272e85a33287c1f6f92ba3af5d262bbf616be19abebb4e74a11c394e44d491ead8a4f7ca1b70b1ecb507f63a2526e9e93f8f29e72e51d0ee7bdc40d26 MISC metadata.xml 354 BLAKE2B e7ec71fae294f6f697b0fd99b0ccef24049af7999866344e8da2ebc40bc2988a21f2cb0374b52b781a5f8b55f26ebca364dc93f4e69d957a3ff6bd3c32cd988d SHA512 9008d270ea6757557482edb55c5848aea9a29abfbbad65d93000660a1e51ad2456a2b7ccfcacb80da23b3dd38cee2c4da9645aed48a35edb4a497bbe3a80dd7f diff --git a/dev-python/pythran/pythran-0.14.0.ebuild b/dev-python/pythran/pythran-0.14.0.ebuild index 8ae4f640ebee..942425ac89a7 100644 --- a/dev-python/pythran/pythran-0.14.0.ebuild +++ b/dev-python/pythran/pythran-0.14.0.ebuild @@ -79,13 +79,8 @@ python_test() { case ${EPYTHON} in python3.12) EPYTEST_DESELECT+=( - pythran/tests/test_cases.py::TestCases::test_convnet_run0 - pythran/tests/test_advanced.py::TestAdvanced::test_matmul_operator + # requires numpy.distutils pythran/tests/test_distutils.py::TestDistutils::test_setup_{b,s}dist_install3 - pythran/tests/test_cases.py::TestCases::test_euclidean_distance_square_run0 - pythran/tests/test_numpy_func2.py::TestNumpyFunc2::test_matrix_power{0..2} - pythran/tests/test_numpy_func3.py::TestNumpyFunc3::test_dot{5,7,9,11,12b,13,14b} - pythran/tests/test_numpy_func3.py::TestNumpyFunc3::test_dot{15..23} ) ;; esac diff --git a/dev-python/sphinxcontrib-trio/Manifest b/dev-python/sphinxcontrib-trio/Manifest index 58f7c47eade6..eb2840361824 100644 --- a/dev-python/sphinxcontrib-trio/Manifest +++ b/dev-python/sphinxcontrib-trio/Manifest @@ -1,3 +1,3 @@ DIST sphinxcontrib-trio-1.1.2.tar.gz 24131 BLAKE2B 5ddaf5ed6c85905275e206fdd966745ce4dd7296595c488864df291cb7202725ccab722f306dd9d6c27d660f5cb3e43bf9ab2fe50e8aa5a7232c2615dddbdfd0 SHA512 cb90f37f463fbdd3f810eb6d76b4bdaaabe83317de0ad747fcee55980849d691e272884ecdfcbee58851cf536f268f2520caba281d7550fe3250e92c69164434 -EBUILD sphinxcontrib-trio-1.1.2-r1.ebuild 1094 BLAKE2B e24f420bb83ad91ef60559c959b5f73f50c6cab60216c10bd8d24fab53a632a05312a2ff850d471a85b6c3d6abf8a232d3b93ca4dfe1a0f32b0b82eb4d44409a SHA512 462961c987e3493e04d9b623ec4e4ccb05cf25af0a4b7b32de3fce09da1d393ff5df18c311d1d6a2cae0f2d370477c787d588361ef043dd4525df1857896b0cb +EBUILD sphinxcontrib-trio-1.1.2-r1.ebuild 1063 BLAKE2B b66483f175bd61e41e442322ae233981b2875d8d4a816f7538aedd25a9571141655db266986db112dee3c482bed93e04b2f4f9712fea9c4c0d68ba2a62736390 SHA512 de526ec7485539ccbfe875a3ac0bb76720478087c0c423d0e78f068a7eafe8325c159722f5c9a2cffe216037a568f5dc641caf7768a77d75c2054937cafb3c3e MISC metadata.xml 1118 BLAKE2B f86bb065d9a5073e419a2c34c88412f0340de6e444afc26ee316a05b962699dd744a790758e2409d3d0b32378d865f66d8d7e8392fdd4523b393566caf67e65a SHA512 a16c4e89c6be00a81c3278f8c8ebe6cd75d1b1cba1e8c9f9d1aa4d2bd318073687556adf91f44c1cd39c2e26a179153b1bbee501101fe26d154f1d69a1a2d376 diff --git a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2-r1.ebuild b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2-r1.ebuild index be14180a3062..66e52305a688 100644 --- a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2-r1.ebuild +++ b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2-r1.ebuild @@ -3,9 +3,10 @@ EAPI=8 -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 +PYTHON_COMPAT=( python3_{10..12} ) + inherit distutils-r1 pypi DESCRIPTION="Make Sphinx better at documenting Python functions and methods" @@ -18,21 +19,27 @@ LICENSE="|| ( Apache-2.0 MIT )" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86" SLOT="0" -RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]" +RDEPEND=" + dev-python/sphinx[${PYTHON_USEDEP}] +" BDEPEND=" test? ( - dev-python/async_generator[${PYTHON_USEDEP}] dev-python/cssselect[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] -)" + ) +" # AttributeError: 'Sphinx' object has no attribute 'add_stylesheet' #distutils_enable_sphinx docs/source distutils_enable_tests pytest python_test() { - # https://github.com/python-trio/sphinxcontrib-trio/issues/260 - local -x PYTHONPATH="${BUILD_DIR}/install/usr/lib/${EPYTHON}/site-packages" - epytest --deselect tests/test_sphinxcontrib_trio.py::test_end_to_end + local EPYTEST_DESELECT=( + # https://github.com/python-trio/sphinxcontrib-trio/issues/260 + tests/test_sphinxcontrib_trio.py::test_end_to_end + ) + + local -x PYTHONPATH="${BUILD_DIR}/install$(python_get_sitedir)" + epytest } -- cgit v1.2.3