* [gentoo-commits] repo/gentoo:master commit in: dev-python/autopep8/files/, dev-python/autopep8/
@ 2017-05-27 15:36 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2017-05-27 15:36 UTC (permalink / raw
To: gentoo-commits
commit: edd1165aaf308f62023f784c354bb77aac1eb1ac
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 15:35:36 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat May 27 15:36:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edd1165a
dev-python/autopep8: Version bump to 1.3.2
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-python/autopep8/Manifest | 1 -
dev-python/autopep8/autopep8-1.3.1.ebuild | 40 ----------------------
.../files/autopep8-1.3.1-test-line-length.patch | 28 ---------------
3 files changed, 69 deletions(-)
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index b52c3726621..dc1c6d89006 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,4 +1,3 @@
DIST autopep8-1.0.4.tar.gz 121476 SHA256 58883a80d501f6f5d97859f100414c6b6f6131fcfc08bd88364c2ecb37a55153 SHA512 53e902dcdd654b9d67d9a31a2343503b754bec78630a7fd8d229843c53eb27d11c32fd6a4829714ac4d7cbee59b055d12e60453ae4ee01cb6131bf9c5045426f WHIRLPOOL 44748dfce6202e1e82c468862e4505500c939ee88eb474392767e606c537a66736f2788c0b6573db37b7c207f3f4608b2a6ecb0fb231bb8c3c090040d17f0642
DIST autopep8-1.2.4.tar.gz 105273 SHA256 38e31e266e29808e8a65a307778ed8e402e1f0d87472009420d6d18146cdeaa2 SHA512 f56c143d94521487628b225d9a0464ee5c8ca69aaea0c5e43c84f1dd920a0274508c6831da429e716829c38bc7c357842bb6403b8b61c04b464240e3573e05d6 WHIRLPOOL f551f8e2cb8b71664c2e47f7458c9923b70b420c044f980d67172b17f7ea9aa328141f9af648eedb400379dfb5a6ab804671fb1f942f8cca8a3ad851a5e9b3d2
-DIST autopep8-1.3.1.tar.gz 107541 SHA256 405eaa5199c74a0570125916e6af44d39343c1fcaaafee117fc329a3f86048c4 SHA512 f20de070b27520a9de56477b7d7b0ea2d3924b882687a43acb4cdbd25a727cfa48e15be4511be1706755e66164164766b405be3230edaecc8563e835e866a030 WHIRLPOOL a5579a23ab9112918c037ab9c10395c9841db919538f7dddb21ae15b8135f6cbc6cbff1403daaaedb95a97b3e6dfc841baa4c73186ebf05a393e276d164b7464
DIST autopep8-1.3.2.tar.gz 107915 SHA256 7e82590bf366b4d891ac5c1535554c46a5f79e4400a190a8493e92e75c5037dd SHA512 cb9a5e297ce705722d5e65472dbe749e57fa12fe8dee0d4c3dc20d9e885e0d885339627667110318c89c6bf7e337203a7831c0e2217e5a5d7951edcb98d3df4f WHIRLPOOL 8e1d4a9a71e4cc790060a393f5512913d567855d886776b4e32db4ffcef0bb82c793b3af833ddec1dc0f08e585f2d9163ec1c8ee67f118f4b982740ffec89f6e
diff --git a/dev-python/autopep8/autopep8-1.3.1.ebuild b/dev-python/autopep8/autopep8-1.3.1.ebuild
deleted file mode 100644
index fbabaae4407..00000000000
--- a/dev-python/autopep8/autopep8-1.3.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.python.org/pypi/autopep8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
- >=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
- >=dev-python/pycodestyle-2.3[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- >=dev-python/pydiff-0.1.2[${PYTHON_USEDEP}]
- )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.1-test-line-length.patch )
-
-python_prepare_all() {
- # Prevent UnicodeDecodeError with LANG=C
- sed -e "/é/d" -i MANIFEST.in || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-python/autopep8/files/autopep8-1.3.1-test-line-length.patch b/dev-python/autopep8/files/autopep8-1.3.1-test-line-length.patch
deleted file mode 100644
index 5644a8a8a72..00000000000
--- a/dev-python/autopep8/files/autopep8-1.3.1-test-line-length.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fails with the following message:
-
-======================================================================
-FAIL: test_local_pycodestyle_config_line_length (test.test_autopep8.ConfigurationTests)
-----------------------------------------------------------------------
-Traceback (most recent call last):
- File "/var/tmp/portage/dev-python/autopep8-1.3.1/work/autopep8-1.3.1/test/test_autopep8.py", line 4724, in test_local_pycodestyle_config_line_length
- self.assertEqual(args.max_line_length, 40)
-AssertionError: 79 != 40
-
-----------------------------------------------------------------------
-
---- a/test/test_autopep8.py
-+++ b/test/test_autopep8.py
-@@ -4715,13 +4715,6 @@
- self.assertEqual(args.global_config, 'False')
- self.assertEqual(args.indent_size, 2)
-
-- def test_local_pycodestyle_config_line_length(self):
-- args = autopep8.parse_args(
-- [os.path.join(FAKE_PYCODESTYLE_CONFIGURATION, 'foo.py'),
-- '--global-config={0}'.format(os.devnull)],
-- apply_config=True)
-- self.assertEqual(args.max_line_length, 40)
--
- def test_config_false_with_local_autocomplete(self):
- args = autopep8.parse_args(
- [os.path.join(FAKE_CONFIGURATION, 'foo.py'),
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/autopep8/files/, dev-python/autopep8/
@ 2022-08-21 18:52 Arthur Zamarin
0 siblings, 0 replies; 5+ messages in thread
From: Arthur Zamarin @ 2022-08-21 18:52 UTC (permalink / raw
To: gentoo-commits
commit: 42fab65962f76b527744488210678ea4bda7b468
Author: Jinqiang Zhang <peeweep <AT> 0x0 <DOT> ee>
AuthorDate: Sun Aug 21 03:36:17 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 21 18:41:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42fab659
dev-python/autopep8: enable py3.11
This is part of https://github.com/gentoo/gentoo/pull/26805
Add python 3.11 target to autopep8, and add patch to pass the test cases.
I update the latest version autopep8-1.7.0.
dev-python/python-lsp-server depend on the autopep8 >=1.6.0 and <1.7.0, so I also update the autopep8-1.6.0.
Signed-off-by: Jinqiang Zhang <peeweep <AT> 0x0.ee>
Closes: https://github.com/gentoo/gentoo/pull/26891
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-python/autopep8/autopep8-1.6.0.ebuild | 8 +++++--
dev-python/autopep8/autopep8-1.7.0.ebuild | 6 ++++-
...autopep8-1.6.0-lib2to3-deprecation-pytest.patch | 28 ++++++++++++++++++++++
3 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/dev-python/autopep8/autopep8-1.6.0.ebuild b/dev-python/autopep8/autopep8-1.6.0.ebuild
index 2c892ed26d7e..ebe36cfed891 100644
--- a/dev-python/autopep8/autopep8-1.6.0.ebuild
+++ b/dev-python/autopep8/autopep8-1.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
@@ -26,3 +26,7 @@ RDEPEND="
dev-python/toml[${PYTHON_USEDEP}]"
distutils_enable_tests unittest
+
+PATCHES=(
+ "${FILESDIR}"/autopep8-1.6.0-lib2to3-deprecation-pytest.patch
+)
diff --git a/dev-python/autopep8/autopep8-1.7.0.ebuild b/dev-python/autopep8/autopep8-1.7.0.ebuild
index 6ddc994a7a0e..8a4cf8b6e538 100644
--- a/dev-python/autopep8/autopep8-1.7.0.ebuild
+++ b/dev-python/autopep8/autopep8-1.7.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
@@ -31,3 +31,7 @@ EPYTEST_DESELECT=(
# test require in source build
test/test_autopep8.py::SystemTests::test_e101_skip_innocuous
)
+
+PATCHES=(
+ "${FILESDIR}"/autopep8-1.6.0-lib2to3-deprecation-pytest.patch
+)
diff --git a/dev-python/autopep8/files/autopep8-1.6.0-lib2to3-deprecation-pytest.patch b/dev-python/autopep8/files/autopep8-1.6.0-lib2to3-deprecation-pytest.patch
new file mode 100644
index 000000000000..9aadf2758c0c
--- /dev/null
+++ b/dev-python/autopep8/files/autopep8-1.6.0-lib2to3-deprecation-pytest.patch
@@ -0,0 +1,28 @@
+--- a/test/test_autopep8.py 2022-07-01 16:53:14.197393816 +0300
++++ b/test/test_autopep8.py 2022-07-01 17:26:07.740358186 +0300
+@@ -5729,7 +5729,11 @@
+ list(AUTOPEP8_CMD_TUPLE) + [filename, '--in-place'],
+ stderr=PIPE,
+ )
+- _, err = p.communicate()
++ _, error = p.communicate()
++ if b'DeprecationWarning: lib2to3 package is deprecated' in error:
++ err = bytes()
++ else:
++ err = error
+ self.assertEqual(err, b'')
+ self.assertEqual(p.returncode, autopep8.EXIT_CODE_OK)
+
+@@ -5741,7 +5745,11 @@
+ list(AUTOPEP8_CMD_TUPLE) + [filename, '--in-place'],
+ stderr=PIPE,
+ )
+- _, err = p.communicate()
++ _, error = p.communicate()
++ if b'DeprecationWarning: lib2to3 package is deprecated' in error:
++ err = bytes()
++ else:
++ err = error
+ self.assertEqual(err, b'')
+ self.assertEqual(p.returncode, autopep8.EXIT_CODE_OK)
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/autopep8/files/, dev-python/autopep8/
@ 2022-10-14 11:40 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2022-10-14 11:40 UTC (permalink / raw
To: gentoo-commits
commit: 69078e4e931ff888b20e74ad4c9ed3cb2d57cd5a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 11:14:58 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 11:14:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69078e4e
dev-python/autopep8: Use tomli instead of toml
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
...opep8-1.7.0.ebuild => autopep8-1.7.0-r1.ebuild} | 4 +-
dev-python/autopep8/autopep8-9999.ebuild | 3 +-
.../autopep8/files/autopep8-1.7.0-tomli.patch | 57 ++++++++++++++++++++++
3 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/dev-python/autopep8/autopep8-1.7.0.ebuild b/dev-python/autopep8/autopep8-1.7.0-r1.ebuild
similarity index 92%
rename from dev-python/autopep8/autopep8-1.7.0.ebuild
rename to dev-python/autopep8/autopep8-1.7.0-r1.ebuild
index 31163b3a63e5..58d653e49809 100644
--- a/dev-python/autopep8/autopep8-1.7.0.ebuild
+++ b/dev-python/autopep8/autopep8-1.7.0-r1.ebuild
@@ -23,7 +23,8 @@ SLOT="0"
RDEPEND="
>=dev-python/pycodestyle-2.9.1[${PYTHON_USEDEP}]
- dev-python/toml[${PYTHON_USEDEP}]"
+ dev-python/tomli[${PYTHON_USEDEP}]
+"
distutils_enable_tests pytest
@@ -34,4 +35,5 @@ EPYTEST_DESELECT=(
PATCHES=(
"${FILESDIR}"/autopep8-1.6.0-lib2to3-deprecation-pytest.patch
+ "${FILESDIR}"/${P}-tomli.patch
)
diff --git a/dev-python/autopep8/autopep8-9999.ebuild b/dev-python/autopep8/autopep8-9999.ebuild
index 91c5dbfceeba..bb50e6c643bd 100644
--- a/dev-python/autopep8/autopep8-9999.ebuild
+++ b/dev-python/autopep8/autopep8-9999.ebuild
@@ -24,6 +24,7 @@ SLOT="0"
RDEPEND="
>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
- dev-python/toml[${PYTHON_USEDEP}]"
+ dev-python/tomli[${PYTHON_USEDEP}]
+"
distutils_enable_tests unittest
diff --git a/dev-python/autopep8/files/autopep8-1.7.0-tomli.patch b/dev-python/autopep8/files/autopep8-1.7.0-tomli.patch
new file mode 100644
index 000000000000..6a8dd147d474
--- /dev/null
+++ b/dev-python/autopep8/files/autopep8-1.7.0-tomli.patch
@@ -0,0 +1,57 @@
+From d0836947df66a052a1d18925a64feb0374598f02 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 6 Apr 2022 18:30:11 +0200
+Subject: [PATCH] Use tomli in place of unmaintained toml package
+
+Use the modern `tomli` TOML parser instead of `toml`. The latter
+package is no longer maintained and does not support TOML 1.0.
+---
+ autopep8.py | 10 +++++-----
+ setup.py | 2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/autopep8.py b/autopep8.py
+index d856f711..ab1a88ac 100755
+--- a/autopep8.py
++++ b/autopep8.py
+@@ -4040,13 +4040,13 @@ def read_config(args, parser):
+
+ def read_pyproject_toml(args, parser):
+ """Read pyproject.toml and load configuration."""
+- import toml
++ import tomli
+
+ config = None
+
+ if os.path.exists(args.global_config):
+- with open(args.global_config) as fp:
+- config = toml.load(fp)
++ with open(args.global_config, "rb") as fp:
++ config = tomli.load(fp)
+
+ if not args.ignore_local_config:
+ parent = tail = args.files and os.path.abspath(
+@@ -4054,8 +4054,8 @@ def read_pyproject_toml(args, parser):
+ while tail:
+ pyproject_toml = os.path.join(parent, "pyproject.toml")
+ if os.path.exists(pyproject_toml):
+- with open(pyproject_toml) as fp:
+- config = toml.load(fp)
++ with open(pyproject_toml, "rb") as fp:
++ config = tomli.load(fp)
+ break
+ (parent, tail) = os.path.split(parent)
+
+diff --git a/setup.py b/setup.py
+index caa639bf..4849574a 100755
+--- a/setup.py
++++ b/setup.py
+@@ -10,7 +10,7 @@
+
+
+ INSTALL_REQUIRES = (
+- ['pycodestyle >= 2.9.1', 'toml']
++ ['pycodestyle >= 2.9.1', 'tomli']
+ )
+
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/autopep8/files/, dev-python/autopep8/
@ 2022-11-29 8:48 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2022-11-29 8:48 UTC (permalink / raw
To: gentoo-commits
commit: 64fae0c2cb02859b1c52ccbf5cc7781815d6771f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 08:46:15 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 08:48:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64fae0c2
dev-python/autopep8: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/autopep8/Manifest | 3 --
dev-python/autopep8/autopep8-1.6.0.ebuild | 32 ------------
dev-python/autopep8/autopep8-1.7.0-r1.ebuild | 39 ---------------
dev-python/autopep8/autopep8-1.7.1.ebuild | 42 ----------------
.../autopep8/files/autopep8-1.7.0-tomli.patch | 57 ----------------------
5 files changed, 173 deletions(-)
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index 0e0f1d1a64d1..552e26e681d5 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,4 +1 @@
-DIST autopep8-1.6.0.tar.gz 122165 BLAKE2B 606ccf7ab51b52db95287384f9b19fd0f72da9e8fb4537bf395651622a95f88d782679550e61816d60dd3faa2fa096c979575d60cbd95476fa1cd7cf2c4f4180 SHA512 f4ffd564ceb48ff1f37d0a051aa8fefc60595a68709045c13561d8ab73de48dce99cc12acf40559e587ba4f6fddd4727dd2b40691ce43c991d60dda2c8b0d617
-DIST autopep8-1.7.0.tar.gz 117055 BLAKE2B 36e2789551eb671b0bc7481742d9edf25aa622bd3f605fb2491195c45f7630378116e4b0bffb536cf7596b3b1c5ea695796259b944a886d55f05c9891e280d0c SHA512 e93ddf90ff989af71790f70f7e7101f7cc60890c8a976552a097c13b0a0e10c16dfd8770214b19d7fabd59403e6d87a9a37d75a2c6f3ed27f8c82a7d8da95dad
-DIST autopep8-1.7.1.tar.gz 117449 BLAKE2B 27bfdc58f647f3f2a7c3945f7faee152667e1dffc13c2b4a5af1f74e7d544c21d1472dc34c797818ca45fccae9f53e7a333c71b52b825b0fb97b50f12567889b SHA512 7a4a8ebf0bacd781fdf7ae32a34bd64f5b6ba9e8ccef5709799cefe5e5bc24da47f36ea49092e26a7c3e254bbea5d6feaeca38f64ffc3fe440307b1331be4766
DIST autopep8-2.0.0.tar.gz 117507 BLAKE2B 8722b19454f47d0b960e3cc0e18ff3d6150ead009630047ecd1ce9001ea6f6d68595f80d7ad1087bddd2993e95d0634d63495b1d43dee095d114535bf632d1bf SHA512 883b79f7011a374a2ef88073a45748268a20449a3bc8da519c036c71700352dd8c4accc60fcb592f1a53ceac06984fcbe6ede8a272bc718c2b79873be5f35dd8
diff --git a/dev-python/autopep8/autopep8-1.6.0.ebuild b/dev-python/autopep8/autopep8-1.6.0.ebuild
deleted file mode 100644
index ebe36cfed891..000000000000
--- a/dev-python/autopep8/autopep8-1.6.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
- >=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
- dev-python/toml[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-PATCHES=(
- "${FILESDIR}"/autopep8-1.6.0-lib2to3-deprecation-pytest.patch
-)
diff --git a/dev-python/autopep8/autopep8-1.7.0-r1.ebuild b/dev-python/autopep8/autopep8-1.7.0-r1.ebuild
deleted file mode 100644
index 58d653e49809..000000000000
--- a/dev-python/autopep8/autopep8-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
- >=dev-python/pycodestyle-2.9.1[${PYTHON_USEDEP}]
- dev-python/tomli[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
- # test require in source build
- test/test_autopep8.py::SystemTests::test_e101_skip_innocuous
-)
-
-PATCHES=(
- "${FILESDIR}"/autopep8-1.6.0-lib2to3-deprecation-pytest.patch
- "${FILESDIR}"/${P}-tomli.patch
-)
diff --git a/dev-python/autopep8/autopep8-1.7.1.ebuild b/dev-python/autopep8/autopep8-1.7.1.ebuild
deleted file mode 100644
index b201d023a72a..000000000000
--- a/dev-python/autopep8/autopep8-1.7.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="
- https://github.com/hhatto/autopep8/
- https://pypi.org/project/autopep8/
-"
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
- >=dev-python/pycodestyle-2.9.1[${PYTHON_USEDEP}]
- dev-python/tomli[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
- # test require in source build
- test/test_autopep8.py::SystemTests::test_e101_skip_innocuous
-)
-
-PATCHES=(
- "${FILESDIR}"/autopep8-1.6.0-lib2to3-deprecation-pytest.patch
-)
diff --git a/dev-python/autopep8/files/autopep8-1.7.0-tomli.patch b/dev-python/autopep8/files/autopep8-1.7.0-tomli.patch
deleted file mode 100644
index 6a8dd147d474..000000000000
--- a/dev-python/autopep8/files/autopep8-1.7.0-tomli.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d0836947df66a052a1d18925a64feb0374598f02 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 6 Apr 2022 18:30:11 +0200
-Subject: [PATCH] Use tomli in place of unmaintained toml package
-
-Use the modern `tomli` TOML parser instead of `toml`. The latter
-package is no longer maintained and does not support TOML 1.0.
----
- autopep8.py | 10 +++++-----
- setup.py | 2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/autopep8.py b/autopep8.py
-index d856f711..ab1a88ac 100755
---- a/autopep8.py
-+++ b/autopep8.py
-@@ -4040,13 +4040,13 @@ def read_config(args, parser):
-
- def read_pyproject_toml(args, parser):
- """Read pyproject.toml and load configuration."""
-- import toml
-+ import tomli
-
- config = None
-
- if os.path.exists(args.global_config):
-- with open(args.global_config) as fp:
-- config = toml.load(fp)
-+ with open(args.global_config, "rb") as fp:
-+ config = tomli.load(fp)
-
- if not args.ignore_local_config:
- parent = tail = args.files and os.path.abspath(
-@@ -4054,8 +4054,8 @@ def read_pyproject_toml(args, parser):
- while tail:
- pyproject_toml = os.path.join(parent, "pyproject.toml")
- if os.path.exists(pyproject_toml):
-- with open(pyproject_toml) as fp:
-- config = toml.load(fp)
-+ with open(pyproject_toml, "rb") as fp:
-+ config = tomli.load(fp)
- break
- (parent, tail) = os.path.split(parent)
-
-diff --git a/setup.py b/setup.py
-index caa639bf..4849574a 100755
---- a/setup.py
-+++ b/setup.py
-@@ -10,7 +10,7 @@
-
-
- INSTALL_REQUIRES = (
-- ['pycodestyle >= 2.9.1', 'toml']
-+ ['pycodestyle >= 2.9.1', 'tomli']
- )
-
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/autopep8/files/, dev-python/autopep8/
@ 2023-02-16 20:32 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2023-02-16 20:32 UTC (permalink / raw
To: gentoo-commits
commit: 9cf124a820897591238ac53b14bf713b5e77909d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 20:31:03 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 20:31:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cf124a8
dev-python/autopep8: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/autopep8/Manifest | 1 -
dev-python/autopep8/autopep8-2.0.0.ebuild | 42 ----------------------
...autopep8-1.6.0-lib2to3-deprecation-pytest.patch | 28 ---------------
3 files changed, 71 deletions(-)
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index 97b274a5f387..701dca14bc07 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,2 +1 @@
-DIST autopep8-2.0.0.tar.gz 117507 BLAKE2B 8722b19454f47d0b960e3cc0e18ff3d6150ead009630047ecd1ce9001ea6f6d68595f80d7ad1087bddd2993e95d0634d63495b1d43dee095d114535bf632d1bf SHA512 883b79f7011a374a2ef88073a45748268a20449a3bc8da519c036c71700352dd8c4accc60fcb592f1a53ceac06984fcbe6ede8a272bc718c2b79873be5f35dd8
DIST autopep8-2.0.1.tar.gz 115905 BLAKE2B 9dde8d702a0b21fb1457e08120dca805e2b46e3e5284e5d98932ff93afc4c0ac8dbc60215f35b64d4a308d6748df1411c2979d8fa1f4949b1dbe213bf19de9dc SHA512 cc0e8e5b7228ba9b37adaa3b2689a5e1ad04eb84366c5300d7a220b1593a64e4f1dc332750f8ca53935dec6a3ea1d07cae5615373e44da357a980d9763bbc3f1
diff --git a/dev-python/autopep8/autopep8-2.0.0.ebuild b/dev-python/autopep8/autopep8-2.0.0.ebuild
deleted file mode 100644
index 162c3d53396b..000000000000
--- a/dev-python/autopep8/autopep8-2.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="
- https://github.com/hhatto/autopep8/
- https://pypi.org/project/autopep8/
-"
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
- >=dev-python/pycodestyle-2.9.1[${PYTHON_USEDEP}]
- dev-python/tomli[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
- # test require in source build
- test/test_autopep8.py::SystemTests::test_e101_skip_innocuous
-)
-
-PATCHES=(
- "${FILESDIR}"/autopep8-1.6.0-lib2to3-deprecation-pytest.patch
-)
diff --git a/dev-python/autopep8/files/autopep8-1.6.0-lib2to3-deprecation-pytest.patch b/dev-python/autopep8/files/autopep8-1.6.0-lib2to3-deprecation-pytest.patch
deleted file mode 100644
index 9aadf2758c0c..000000000000
--- a/dev-python/autopep8/files/autopep8-1.6.0-lib2to3-deprecation-pytest.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/test/test_autopep8.py 2022-07-01 16:53:14.197393816 +0300
-+++ b/test/test_autopep8.py 2022-07-01 17:26:07.740358186 +0300
-@@ -5729,7 +5729,11 @@
- list(AUTOPEP8_CMD_TUPLE) + [filename, '--in-place'],
- stderr=PIPE,
- )
-- _, err = p.communicate()
-+ _, error = p.communicate()
-+ if b'DeprecationWarning: lib2to3 package is deprecated' in error:
-+ err = bytes()
-+ else:
-+ err = error
- self.assertEqual(err, b'')
- self.assertEqual(p.returncode, autopep8.EXIT_CODE_OK)
-
-@@ -5741,7 +5745,11 @@
- list(AUTOPEP8_CMD_TUPLE) + [filename, '--in-place'],
- stderr=PIPE,
- )
-- _, err = p.communicate()
-+ _, error = p.communicate()
-+ if b'DeprecationWarning: lib2to3 package is deprecated' in error:
-+ err = bytes()
-+ else:
-+ err = error
- self.assertEqual(err, b'')
- self.assertEqual(p.returncode, autopep8.EXIT_CODE_OK)
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-02-16 20:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-29 8:48 [gentoo-commits] repo/gentoo:master commit in: dev-python/autopep8/files/, dev-python/autopep8/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-02-16 20:32 Michał Górny
2022-10-14 11:40 Michał Górny
2022-08-21 18:52 Arthur Zamarin
2017-05-27 15:36 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox