* [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgcheck/, dev-util/pkgcheck/files/
@ 2021-05-09 9:13 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2021-05-09 9:13 UTC (permalink / raw
To: gentoo-commits
commit: 20f30c3568750f4a818ef653be4036b0dca927f5
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 9 09:02:52 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 9 09:13:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20f30c35
dev-util/pkgcheck: Fix PythonCompatUpdate handling of py3.10
Fix PythonCompatUpdate check to treat python3.10 as newer than 3.9.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/pkgcheck-0.9.7-py310-update.patch | 170 +++++++++++++++++++++
dev-util/pkgcheck/pkgcheck-0.9.7-r1.ebuild | 63 ++++++++
2 files changed, 233 insertions(+)
diff --git a/dev-util/pkgcheck/files/pkgcheck-0.9.7-py310-update.patch b/dev-util/pkgcheck/files/pkgcheck-0.9.7-py310-update.patch
new file mode 100644
index 00000000000..8bee592b228
--- /dev/null
+++ b/dev-util/pkgcheck/files/pkgcheck-0.9.7-py310-update.patch
@@ -0,0 +1,170 @@
+From 443c0aab158e34196399073e801ae19ae0dce4dc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 9 May 2021 10:59:18 +0200
+Subject: [PATCH] python: Fix treating python3.10 as newer than python3.9
+
+Fix the sorting logic to use a combined lexical-numerical sort, in order
+to sort python3.10 as newer than python3.9. This fixes
+PythonCompatUpdate check.
+---
+ src/pkgcheck/checks/python.py | 25 +++++++++++++++----
+ .../PythonCompatUpdate/expected.json | 6 ++---
+ .../PythonCompatUpdate/fix.patch | 6 ++---
+ .../profiles/desc/python_single_target.desc | 1 +
+ .../python/profiles/desc/python_targets.desc | 1 +
+ .../stub/python-dep1/python-dep1-0.ebuild | 2 +-
+ .../stub/python-dep2/python-dep2-0.ebuild | 2 +-
+ 7 files changed, 30 insertions(+), 13 deletions(-)
+
+diff --git a/src/pkgcheck/checks/python.py b/src/pkgcheck/checks/python.py
+index ed922215..7f0e9be4 100644
+--- a/src/pkgcheck/checks/python.py
++++ b/src/pkgcheck/checks/python.py
+@@ -1,4 +1,5 @@
+ import itertools
++import re
+
+ from pkgcore.ebuild.atom import atom
+ from pkgcore.restrictions import packages, values
+@@ -28,6 +29,18 @@ CHECK_EXCLUDE = frozenset(['virtual/pypy', 'virtual/pypy3'])
+ IUSE_PREFIX = 'python_targets_'
+ IUSE_PREFIX_S = 'python_single_target_'
+
++TARGET_SPLIT_RE = re.compile(r'([0-9]+)')
++
++
++def target_sort_key(target):
++ def iter():
++ for x in TARGET_SPLIT_RE.split(target):
++ try:
++ yield int(x)
++ except ValueError:
++ yield x
++ return tuple(iter())
++
+
+ def get_python_eclass(pkg):
+ eclasses = ECLASSES.intersection(pkg.inherited)
+@@ -281,14 +294,14 @@ class PythonCompatCheck(Check):
+ for target, _desc in repo.config.use_expand_desc.get(IUSE_PREFIX[:-1], ()):
+ if target[len(IUSE_PREFIX):].startswith('python'):
+ targets.append(target[len(IUSE_PREFIX):])
+- multi_targets = tuple(sorted(targets))
++ multi_targets = tuple(sorted(targets, key=target_sort_key))
+
+ # determine available PYTHON_SINGLE_TARGET use flags
+ targets = []
+ for target, _desc in repo.config.use_expand_desc.get(IUSE_PREFIX_S[:-1], ()):
+ if target[len(IUSE_PREFIX_S):].startswith('python'):
+ targets.append(target[len(IUSE_PREFIX_S):])
+- single_targets = tuple(sorted(targets))
++ single_targets = tuple(sorted(targets, key=target_sort_key))
+
+ self.params = {
+ 'python-r1': (multi_targets, IUSE_PREFIX, None),
+@@ -327,8 +340,9 @@ class PythonCompatCheck(Check):
+ try:
+ # determine the latest supported python version
+ latest_target = sorted(
+- f"python{x.slot.replace('.', '_')}" for x in deps
+- if x.key == 'dev-lang/python' and x.slot is not None)[-1]
++ (f"python{x.slot.replace('.', '_')}" for x in deps
++ if x.key == 'dev-lang/python' and x.slot is not None),
++ key=target_sort_key)[-1]
+ except IndexError:
+ # should be flagged by PythonMissingDeps
+ return
+@@ -355,4 +369,5 @@ class PythonCompatCheck(Check):
+ except IndexError:
+ return
+
+- yield PythonCompatUpdate(sorted(targets), pkg=pkg)
++ yield PythonCompatUpdate(sorted(targets, key=target_sort_key),
++ pkg=pkg)
+diff --git a/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/expected.json b/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/expected.json
+index ab7d9b01..f3476eac 100644
+--- a/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/expected.json
++++ b/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/expected.json
+@@ -1,3 +1,3 @@
+-{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "0", "updates": ["python3_8", "python3_9"]}
+-{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "1", "updates": ["python3_9"]}
+-{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "2", "updates": ["python3_9"]}
++{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "0", "updates": ["python3_8", "python3_9", "python3_10"]}
++{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "1", "updates": ["python3_9", "python3_10"]}
++{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "2", "updates": ["python3_9", "python3_10"]}
+diff --git a/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/fix.patch b/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/fix.patch
+index c63184e9..9be4952a 100644
+--- a/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/fix.patch
++++ b/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/fix.patch
+@@ -4,7 +4,7 @@ diff -Naur python/PythonCompatCheck/PythonCompatUpdate/PythonCompatUpdate-0.ebui
+ @@ -1,5 +1,5 @@
+ EAPI=7
+ -PYTHON_COMPAT=( python3_7 )
+-+PYTHON_COMPAT=( python3_{7..9} )
+++PYTHON_COMPAT=( python3_{7..10} )
+
+ inherit python-r1
+
+@@ -14,7 +14,7 @@ diff -Naur python/PythonCompatCheck/PythonCompatUpdate/PythonCompatUpdate-1.ebui
+ @@ -1,5 +1,5 @@
+ EAPI=7
+ -PYTHON_COMPAT=( python3_{7,8} )
+-+PYTHON_COMPAT=( python3_{7..9} )
+++PYTHON_COMPAT=( python3_{7..10} )
+
+ inherit python-single-r1
+
+@@ -24,7 +24,7 @@ diff -Naur python/PythonCompatCheck/PythonCompatUpdate/PythonCompatUpdate-2.ebui
+ @@ -1,5 +1,5 @@
+ EAPI=7
+ -PYTHON_COMPAT=( python3_{7,8} )
+-+PYTHON_COMPAT=( python3_{7..9} )
+++PYTHON_COMPAT=( python3_{7..10} )
+
+ inherit python-any-r1
+
+diff --git a/testdata/repos/python/profiles/desc/python_single_target.desc b/testdata/repos/python/profiles/desc/python_single_target.desc
+index da5be2fd..3c39a224 100644
+--- a/testdata/repos/python/profiles/desc/python_single_target.desc
++++ b/testdata/repos/python/profiles/desc/python_single_target.desc
+@@ -3,4 +3,5 @@ python2_7 - Build with Python 2.7
+ python3_7 - Build with Python 3.7
+ python3_8 - Build with Python 3.8
+ python3_9 - Build with Python 3.9
++python3_10 - Build with Python 3.10
+ pypy3 - Build for PyPy3 only
+diff --git a/testdata/repos/python/profiles/desc/python_targets.desc b/testdata/repos/python/profiles/desc/python_targets.desc
+index b2be59ca..8e55f2da 100644
+--- a/testdata/repos/python/profiles/desc/python_targets.desc
++++ b/testdata/repos/python/profiles/desc/python_targets.desc
+@@ -3,4 +3,5 @@ python2_7 - Build with Python 2.7
+ python3_7 - Build with Python 3.7
+ python3_8 - Build with Python 3.8
+ python3_9 - Build with Python 3.9
++python3_10 - Build with Python 3.10
+ pypy3 - Build for PyPy3 only
+diff --git a/testdata/repos/python/stub/python-dep1/python-dep1-0.ebuild b/testdata/repos/python/stub/python-dep1/python-dep1-0.ebuild
+index 9eebedfd..55c455d9 100644
+--- a/testdata/repos/python/stub/python-dep1/python-dep1-0.ebuild
++++ b/testdata/repos/python/stub/python-dep1/python-dep1-0.ebuild
+@@ -1,5 +1,5 @@
+ EAPI=7
+-PYTHON_COMPAT=( python2_7 python3_{7,8,9} )
++PYTHON_COMPAT=( python2_7 python3_{7,8,9,10} )
+
+ inherit python-r1
+
+diff --git a/testdata/repos/python/stub/python-dep2/python-dep2-0.ebuild b/testdata/repos/python/stub/python-dep2/python-dep2-0.ebuild
+index 9eebedfd..55c455d9 100644
+--- a/testdata/repos/python/stub/python-dep2/python-dep2-0.ebuild
++++ b/testdata/repos/python/stub/python-dep2/python-dep2-0.ebuild
+@@ -1,5 +1,5 @@
+ EAPI=7
+-PYTHON_COMPAT=( python2_7 python3_{7,8,9} )
++PYTHON_COMPAT=( python2_7 python3_{7,8,9,10} )
+
+ inherit python-r1
+
+--
+2.31.1
+
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.7-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.7-r1.ebuild
new file mode 100644
index 00000000000..1859af4de53
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.9.7-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+ inherit git-r3
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+ RDEPEND="
+ ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+ ~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+ RDEPEND="
+ >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+ >=sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+ dev-python/chardet[${PYTHON_USEDEP}]
+ dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/pathspec[${PYTHON_USEDEP}]
+ >=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests setup.py
+
+PATCHES=(
+ "${FILESDIR}"/${P}-py310-update.patch
+)
+
+src_test() {
+ local -x PYTHONDONTWRITEBYTECODE=
+ distutils-r1_src_test
+}
+
+python_install_all() {
+ local DOCS=( NEWS.rst )
+ [[ ${PV} == *9999 ]] || doman man/*
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ optfeature "Network check support" dev-python/requests
+ optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgcheck/, dev-util/pkgcheck/files/
@ 2021-08-25 16:55 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2021-08-25 16:55 UTC (permalink / raw
To: gentoo-commits
commit: e5008f4fd9d249c22898875042b3c50a9040c337
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 25 16:53:16 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 25 16:53:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5008f4f
dev-util/pkgcheck: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-util/pkgcheck/Manifest | 4 -
.../files/pkgcheck-0.9.7-py310-update.patch | 170 ---------------------
dev-util/pkgcheck/pkgcheck-0.10.0.ebuild | 59 -------
dev-util/pkgcheck/pkgcheck-0.10.2.ebuild | 59 -------
dev-util/pkgcheck/pkgcheck-0.10.4.ebuild | 59 -------
dev-util/pkgcheck/pkgcheck-0.9.7-r2.ebuild | 60 --------
dev-util/pkgcheck/pkgcheck-0.9.7-r3.ebuild | 64 --------
7 files changed, 475 deletions(-)
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index a34140c8b5e..22f4cace1dd 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,7 +1,3 @@
-DIST pkgcheck-0.10.0.tar.gz 453555 BLAKE2B aeb211619f400b729a9f5e7e1ffa787c33c1c8cf592d9d25aaf3a82e5ca44711b9da6a012f0aa000e7269a40be387efb271f981b038fc29c497f2f660dead74e SHA512 2b702d269e899a4643f40397414a32f78af611cccc0d4a3d816b978bc63dc09d5e0086aebf11711c8d80703fa7e78d36eb884de6908ee548791a0d934569ded9
DIST pkgcheck-0.10.1.tar.gz 454051 BLAKE2B ba0e91fee539d0a41c27da08c91e1c65078eaebea33b8254cbad38d49feb91a4aa490992a5d88bd96ce0570d89f9f8343d0ff0a2d7368f09d55637b2597aad6b SHA512 044067928bc1c1280a95e785def80e6ebb289e0882f9a61b18d1d75ddc22c4f7eea1da4a4621fd5a598c3e7ee75ece2adedb936086f3c3cbc92c23ab93419215
-DIST pkgcheck-0.10.2.tar.gz 454643 BLAKE2B 4585a72ce9675a23a3bcd7228ac811bdf45bacf2a25d91b9665f833de6dffbac5c4e11405b112bd5dd6e643fc51c3f57cf7dda989c2521c11e279324a02740c7 SHA512 0151d6fb81f800d46b65bb02bd5474ae36e8e4dc35376f1abfaa1c8be61e3429e527947b42f76c9f6da5ede648617d58f6b9ac44a93ff58175b748dfd9a43cbe
DIST pkgcheck-0.10.3.tar.gz 454953 BLAKE2B 5ee2c13cb1ca5b13bfcd8434700c69e6839c5dc2f25dec4060020f8477159ff071b1487a446ba7e03bf1b8d139e8c65a1cd21a777d8bfe3ce677bbfe39b8d85f SHA512 edef25fc1542c3d3fb89c0c1546ebfa736b6ad4b113b0e6bc9ede379b0a5cb9ece5dd8b79ddb2df2cfeaf7f67f290e96a8baee1f2dfcc3bcebe32d9dcf4c264e
-DIST pkgcheck-0.10.4.tar.gz 455252 BLAKE2B 3fb8183120b8a45569a007e4c9e521e5b070554523c5c2fbf44c383996896924800d42f79f9809e0fcc3b04363b2c50a8894b547376a8c030f4d0451c7f943bf SHA512 f5f01340ff4ac882da8e56cbb44440425dcb42c5ed6a9ab102c435a61cfca6861a421ee294039f055fec5b93cae338ea4ba23237f1ba509e6e24bdba351427eb
DIST pkgcheck-0.10.5.tar.gz 458314 BLAKE2B 143a397f5374b3f84d957953d0915b6ae7107b81f85af4e37e75289ed0edc5bdf16bdc00213860fdf0bdf53be953b80d514839c6568c3a70d2cdd61401e8dc73 SHA512 3902560099c7e5570be2b86b6e7d56427b6ef9cc893dafe5327b6773b92ca44cc787725a0d2e81d4b779ae71dc2acaeceaaff4d5de50fc99aab4c0dc0ab03bfa
-DIST pkgcheck-0.9.7.tar.gz 453478 BLAKE2B 486bae68af1757fbdb4b109b34cea836cb6dee258d4e53b4c3818c1aa6194da86e7ee339335ac6f2a1c2fb89a547f46658fadd88706fa807a9fdce2bb82a5c65 SHA512 e8fc02997d558af1e8e89a13130076b4db59e9c2a8ea383d0dca9a57375dae1fb315619593178d67c89d30e7b16810905694c838ea4ec608eaee195fa4797569
diff --git a/dev-util/pkgcheck/files/pkgcheck-0.9.7-py310-update.patch b/dev-util/pkgcheck/files/pkgcheck-0.9.7-py310-update.patch
deleted file mode 100644
index 8bee592b228..00000000000
--- a/dev-util/pkgcheck/files/pkgcheck-0.9.7-py310-update.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 443c0aab158e34196399073e801ae19ae0dce4dc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 9 May 2021 10:59:18 +0200
-Subject: [PATCH] python: Fix treating python3.10 as newer than python3.9
-
-Fix the sorting logic to use a combined lexical-numerical sort, in order
-to sort python3.10 as newer than python3.9. This fixes
-PythonCompatUpdate check.
----
- src/pkgcheck/checks/python.py | 25 +++++++++++++++----
- .../PythonCompatUpdate/expected.json | 6 ++---
- .../PythonCompatUpdate/fix.patch | 6 ++---
- .../profiles/desc/python_single_target.desc | 1 +
- .../python/profiles/desc/python_targets.desc | 1 +
- .../stub/python-dep1/python-dep1-0.ebuild | 2 +-
- .../stub/python-dep2/python-dep2-0.ebuild | 2 +-
- 7 files changed, 30 insertions(+), 13 deletions(-)
-
-diff --git a/src/pkgcheck/checks/python.py b/src/pkgcheck/checks/python.py
-index ed922215..7f0e9be4 100644
---- a/src/pkgcheck/checks/python.py
-+++ b/src/pkgcheck/checks/python.py
-@@ -1,4 +1,5 @@
- import itertools
-+import re
-
- from pkgcore.ebuild.atom import atom
- from pkgcore.restrictions import packages, values
-@@ -28,6 +29,18 @@ CHECK_EXCLUDE = frozenset(['virtual/pypy', 'virtual/pypy3'])
- IUSE_PREFIX = 'python_targets_'
- IUSE_PREFIX_S = 'python_single_target_'
-
-+TARGET_SPLIT_RE = re.compile(r'([0-9]+)')
-+
-+
-+def target_sort_key(target):
-+ def iter():
-+ for x in TARGET_SPLIT_RE.split(target):
-+ try:
-+ yield int(x)
-+ except ValueError:
-+ yield x
-+ return tuple(iter())
-+
-
- def get_python_eclass(pkg):
- eclasses = ECLASSES.intersection(pkg.inherited)
-@@ -281,14 +294,14 @@ class PythonCompatCheck(Check):
- for target, _desc in repo.config.use_expand_desc.get(IUSE_PREFIX[:-1], ()):
- if target[len(IUSE_PREFIX):].startswith('python'):
- targets.append(target[len(IUSE_PREFIX):])
-- multi_targets = tuple(sorted(targets))
-+ multi_targets = tuple(sorted(targets, key=target_sort_key))
-
- # determine available PYTHON_SINGLE_TARGET use flags
- targets = []
- for target, _desc in repo.config.use_expand_desc.get(IUSE_PREFIX_S[:-1], ()):
- if target[len(IUSE_PREFIX_S):].startswith('python'):
- targets.append(target[len(IUSE_PREFIX_S):])
-- single_targets = tuple(sorted(targets))
-+ single_targets = tuple(sorted(targets, key=target_sort_key))
-
- self.params = {
- 'python-r1': (multi_targets, IUSE_PREFIX, None),
-@@ -327,8 +340,9 @@ class PythonCompatCheck(Check):
- try:
- # determine the latest supported python version
- latest_target = sorted(
-- f"python{x.slot.replace('.', '_')}" for x in deps
-- if x.key == 'dev-lang/python' and x.slot is not None)[-1]
-+ (f"python{x.slot.replace('.', '_')}" for x in deps
-+ if x.key == 'dev-lang/python' and x.slot is not None),
-+ key=target_sort_key)[-1]
- except IndexError:
- # should be flagged by PythonMissingDeps
- return
-@@ -355,4 +369,5 @@ class PythonCompatCheck(Check):
- except IndexError:
- return
-
-- yield PythonCompatUpdate(sorted(targets), pkg=pkg)
-+ yield PythonCompatUpdate(sorted(targets, key=target_sort_key),
-+ pkg=pkg)
-diff --git a/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/expected.json b/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/expected.json
-index ab7d9b01..f3476eac 100644
---- a/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/expected.json
-+++ b/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/expected.json
-@@ -1,3 +1,3 @@
--{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "0", "updates": ["python3_8", "python3_9"]}
--{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "1", "updates": ["python3_9"]}
--{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "2", "updates": ["python3_9"]}
-+{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "0", "updates": ["python3_8", "python3_9", "python3_10"]}
-+{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "1", "updates": ["python3_9", "python3_10"]}
-+{"__class__": "PythonCompatUpdate", "category": "PythonCompatCheck", "package": "PythonCompatUpdate", "version": "2", "updates": ["python3_9", "python3_10"]}
-diff --git a/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/fix.patch b/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/fix.patch
-index c63184e9..9be4952a 100644
---- a/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/fix.patch
-+++ b/testdata/data/repos/python/PythonCompatCheck/PythonCompatUpdate/fix.patch
-@@ -4,7 +4,7 @@ diff -Naur python/PythonCompatCheck/PythonCompatUpdate/PythonCompatUpdate-0.ebui
- @@ -1,5 +1,5 @@
- EAPI=7
- -PYTHON_COMPAT=( python3_7 )
--+PYTHON_COMPAT=( python3_{7..9} )
-++PYTHON_COMPAT=( python3_{7..10} )
-
- inherit python-r1
-
-@@ -14,7 +14,7 @@ diff -Naur python/PythonCompatCheck/PythonCompatUpdate/PythonCompatUpdate-1.ebui
- @@ -1,5 +1,5 @@
- EAPI=7
- -PYTHON_COMPAT=( python3_{7,8} )
--+PYTHON_COMPAT=( python3_{7..9} )
-++PYTHON_COMPAT=( python3_{7..10} )
-
- inherit python-single-r1
-
-@@ -24,7 +24,7 @@ diff -Naur python/PythonCompatCheck/PythonCompatUpdate/PythonCompatUpdate-2.ebui
- @@ -1,5 +1,5 @@
- EAPI=7
- -PYTHON_COMPAT=( python3_{7,8} )
--+PYTHON_COMPAT=( python3_{7..9} )
-++PYTHON_COMPAT=( python3_{7..10} )
-
- inherit python-any-r1
-
-diff --git a/testdata/repos/python/profiles/desc/python_single_target.desc b/testdata/repos/python/profiles/desc/python_single_target.desc
-index da5be2fd..3c39a224 100644
---- a/testdata/repos/python/profiles/desc/python_single_target.desc
-+++ b/testdata/repos/python/profiles/desc/python_single_target.desc
-@@ -3,4 +3,5 @@ python2_7 - Build with Python 2.7
- python3_7 - Build with Python 3.7
- python3_8 - Build with Python 3.8
- python3_9 - Build with Python 3.9
-+python3_10 - Build with Python 3.10
- pypy3 - Build for PyPy3 only
-diff --git a/testdata/repos/python/profiles/desc/python_targets.desc b/testdata/repos/python/profiles/desc/python_targets.desc
-index b2be59ca..8e55f2da 100644
---- a/testdata/repos/python/profiles/desc/python_targets.desc
-+++ b/testdata/repos/python/profiles/desc/python_targets.desc
-@@ -3,4 +3,5 @@ python2_7 - Build with Python 2.7
- python3_7 - Build with Python 3.7
- python3_8 - Build with Python 3.8
- python3_9 - Build with Python 3.9
-+python3_10 - Build with Python 3.10
- pypy3 - Build for PyPy3 only
-diff --git a/testdata/repos/python/stub/python-dep1/python-dep1-0.ebuild b/testdata/repos/python/stub/python-dep1/python-dep1-0.ebuild
-index 9eebedfd..55c455d9 100644
---- a/testdata/repos/python/stub/python-dep1/python-dep1-0.ebuild
-+++ b/testdata/repos/python/stub/python-dep1/python-dep1-0.ebuild
-@@ -1,5 +1,5 @@
- EAPI=7
--PYTHON_COMPAT=( python2_7 python3_{7,8,9} )
-+PYTHON_COMPAT=( python2_7 python3_{7,8,9,10} )
-
- inherit python-r1
-
-diff --git a/testdata/repos/python/stub/python-dep2/python-dep2-0.ebuild b/testdata/repos/python/stub/python-dep2/python-dep2-0.ebuild
-index 9eebedfd..55c455d9 100644
---- a/testdata/repos/python/stub/python-dep2/python-dep2-0.ebuild
-+++ b/testdata/repos/python/stub/python-dep2/python-dep2-0.ebuild
-@@ -1,5 +1,5 @@
- EAPI=7
--PYTHON_COMPAT=( python2_7 python3_{7,8,9} )
-+PYTHON_COMPAT=( python2_7 python3_{7,8,9,10} )
-
- inherit python-r1
-
---
-2.31.1
-
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.0.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.0.ebuild
deleted file mode 100644
index afa31791177..00000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
- inherit git-r3
-else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
- RDEPEND="
- ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
- ~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
- RDEPEND="
- >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
- >=sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/pathspec[${PYTHON_USEDEP}]
- >=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
- local -x PYTHONDONTWRITEBYTECODE=
- distutils-r1_src_test
-}
-
-python_install_all() {
- local DOCS=( NEWS.rst )
- [[ ${PV} == *9999 ]] || doman man/*
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "Network check support" dev-python/requests
- optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.2.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.2.ebuild
deleted file mode 100644
index 9a255efb057..00000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
- inherit git-r3
-else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
- RDEPEND="
- ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
- ~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
- RDEPEND="
- >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
- >=sys-apps/pkgcore-0.12.1[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/pathspec[${PYTHON_USEDEP}]
- >=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
- local -x PYTHONDONTWRITEBYTECODE=
- distutils-r1_src_test
-}
-
-python_install_all() {
- local DOCS=( NEWS.rst )
- [[ ${PV} == *9999 ]] || doman man/*
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "Network check support" dev-python/requests
- optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.4.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.4.ebuild
deleted file mode 100644
index 9a255efb057..00000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
- inherit git-r3
-else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
- RDEPEND="
- ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
- ~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
- RDEPEND="
- >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
- >=sys-apps/pkgcore-0.12.1[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/pathspec[${PYTHON_USEDEP}]
- >=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
- local -x PYTHONDONTWRITEBYTECODE=
- distutils-r1_src_test
-}
-
-python_install_all() {
- local DOCS=( NEWS.rst )
- [[ ${PV} == *9999 ]] || doman man/*
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "Network check support" dev-python/requests
- optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.7-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.7-r2.ebuild
deleted file mode 100644
index 7cf93d2ab9c..00000000000
--- a/dev-util/pkgcheck/pkgcheck-0.9.7-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
- inherit git-r3
-else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
- RDEPEND="
- ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
- ~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
- RDEPEND="
- >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
- <sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
- >=sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/pathspec[${PYTHON_USEDEP}]
- >=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
- local -x PYTHONDONTWRITEBYTECODE=
- distutils-r1_src_test
-}
-
-python_install_all() {
- local DOCS=( NEWS.rst )
- [[ ${PV} == *9999 ]] || doman man/*
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "Network check support" dev-python/requests
- optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.7-r3.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.7-r3.ebuild
deleted file mode 100644
index 70f186fd253..00000000000
--- a/dev-util/pkgcheck/pkgcheck-0.9.7-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
- inherit git-r3
-else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
- RDEPEND="
- ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
- ~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
- RDEPEND="
- >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
- <sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
- >=sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/pathspec[${PYTHON_USEDEP}]
- >=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-PATCHES=(
- "${FILESDIR}"/${P}-py310-update.patch
-)
-
-src_test() {
- local -x PYTHONDONTWRITEBYTECODE=
- distutils-r1_src_test
-}
-
-python_install_all() {
- local DOCS=( NEWS.rst )
- [[ ${PV} == *9999 ]] || doman man/*
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "Network check support" dev-python/requests
- optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgcheck/, dev-util/pkgcheck/files/
@ 2022-08-01 20:39 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-08-01 20:39 UTC (permalink / raw
To: gentoo-commits
commit: 9b014e793af83734542ff47e16bfdc5bead3bbd9
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 1 19:50:50 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 1 20:39:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b014e79
dev-util/pkgcheck: emacs support for live version
Bug: https://github.com/pkgcore/pkgcheck/pull/420
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/26700
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/pkgcheck/files/50pkgcheck-gentoo.el | 4 ++++
dev-util/pkgcheck/pkgcheck-9999.ebuild | 32 +++++++++++++++++++++++++++-
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/dev-util/pkgcheck/files/50pkgcheck-gentoo.el b/dev-util/pkgcheck/files/50pkgcheck-gentoo.el
new file mode 100644
index 000000000000..7808713be94a
--- /dev/null
+++ b/dev-util/pkgcheck/files/50pkgcheck-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'flycheck-pkgcheck-setup "flycheck-pkgcheck"
+ "Flycheck pkgcheck setup." t)
+(add-hook 'ebuild-mode-hook 'flycheck-pkgcheck-setup)
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 44a8666a2eac..80366db8e2e5 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
+inherit elisp-common distutils-r1 optfeature
if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
@@ -20,6 +20,7 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
LICENSE="BSD MIT"
SLOT="0"
+IUSE="emacs"
if [[ ${PV} == *9999 ]]; then
RDEPEND="
@@ -38,8 +39,14 @@ RDEPEND+="
dev-python/lxml[${PYTHON_USEDEP}]
dev-python/pathspec[${PYTHON_USEDEP}]
>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+ emacs? (
+ >=app-editors/emacs-24.1:*
+ app-emacs/ebuild-mode
+ app-emacs/flycheck
+ )
"
BDEPEND="
+ ${RDEPEND}
test? (
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
@@ -47,10 +54,22 @@ BDEPEND="
)
"
+SITEFILE="50${PN}-gentoo.el"
+
distutils_enable_tests setup.py
export USE_SYSTEM_TREE_SITTER_BASH=1
+src_compile() {
+ distutils-r1_src_compile
+
+ if use emacs ; then
+ pushd "${S}"/contrib/emacs >/dev/null || die
+ elisp-compile *.el
+ popd >/dev/null || die
+ fi
+}
+
src_test() {
local -x PYTHONDONTWRITEBYTECODE=
distutils-r1_src_test
@@ -60,9 +79,20 @@ python_install_all() {
local DOCS=( NEWS.rst )
[[ ${PV} == *9999 ]] || doman man/*
distutils-r1_python_install_all
+
+ if use emacs ; then
+ elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
}
pkg_postinst() {
+ use emacs && elisp-site-regen
+
optfeature "Network check support" dev-python/requests
optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgcheck/, dev-util/pkgcheck/files/
@ 2022-12-31 11:32 Arthur Zamarin
0 siblings, 0 replies; 6+ messages in thread
From: Arthur Zamarin @ 2022-12-31 11:32 UTC (permalink / raw
To: gentoo-commits
commit: 10717ac4ea34a89ed60d1d0d118c491102de9862
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 11:30:19 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 11:30:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10717ac4
dev-util/pkgcheck: fix missing bin/ for replay test
Closes: https://bugs.gentoo.org/888896
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.../files/pkgcheck-0.10.20-fix-replay-bin.patch | 109 +++++++++++++++++++++
dev-util/pkgcheck/pkgcheck-0.10.20.ebuild | 4 +
2 files changed, 113 insertions(+)
diff --git a/dev-util/pkgcheck/files/pkgcheck-0.10.20-fix-replay-bin.patch b/dev-util/pkgcheck/files/pkgcheck-0.10.20-fix-replay-bin.patch
new file mode 100644
index 000000000000..e20c0b3f53f5
--- /dev/null
+++ b/dev-util/pkgcheck/files/pkgcheck-0.10.20-fix-replay-bin.patch
@@ -0,0 +1,109 @@
+test_pkgcheck_replay: fix test_replay_pipe_stdin from sdist
+
+Bug: https://bugs.gentoo.org/888896
+Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
+--- a/tests/scripts/test_pkgcheck_replay.py
++++ b/tests/scripts/test_pkgcheck_replay.py
+@@ -1,20 +1,18 @@
+-import os
+-import subprocess
+ import tempfile
+ from functools import partial
+ from unittest.mock import patch
+
+ import pytest
++from snakeoil.formatters import PlainTextFormatter
++
+ from pkgcheck import __title__ as project
+ from pkgcheck.checks.profiles import ProfileWarning
+ from pkgcheck.reporters import JsonStream
+ from pkgcheck.scripts import run
+-from snakeoil.formatters import PlainTextFormatter
+
+
+ class TestPkgcheckReplay:
+-
+- script = partial(run, project)
++ script = staticmethod(partial(run, project))
+
+ @pytest.fixture(autouse=True)
+ def _setup(self, testconfig):
+@@ -33,11 +31,11 @@ class TestPkgcheckReplay:
+
+ def test_replay(self, capsys):
+ result = ProfileWarning("profile warning: foo")
+- with tempfile.NamedTemporaryFile() as f:
+- out = PlainTextFormatter(f)
++ with tempfile.NamedTemporaryFile() as file:
++ out = PlainTextFormatter(file)
+ with JsonStream(out) as reporter:
+ reporter.report(result)
+- with patch("sys.argv", self.args + ["-R", "StrReporter", f.name]):
++ with patch("sys.argv", self.args + ["-R", "StrReporter", file.name]):
+ with pytest.raises(SystemExit) as excinfo:
+ self.script()
+ out, err = capsys.readouterr()
+@@ -47,13 +45,13 @@ class TestPkgcheckReplay:
+
+ def test_corrupted_resuts(self, capsys):
+ result = ProfileWarning("profile warning: foo")
+- with tempfile.NamedTemporaryFile() as f:
+- out = PlainTextFormatter(f)
++ with tempfile.NamedTemporaryFile() as file:
++ out = PlainTextFormatter(file)
+ with JsonStream(out) as reporter:
+ reporter.report(result)
+- f.write(b"corrupted")
+- f.seek(0)
+- with patch("sys.argv", self.args + ["-R", "StrReporter", f.name]):
++ file.write(b"corrupted")
++ file.seek(0)
++ with patch("sys.argv", self.args + ["-R", "StrReporter", file.name]):
+ with pytest.raises(SystemExit) as excinfo:
+ self.script()
+ out, err = capsys.readouterr()
+@@ -61,26 +59,28 @@ class TestPkgcheckReplay:
+ assert excinfo.value.code == 2
+
+ def test_invalid_file(self, capsys):
+- with tempfile.NamedTemporaryFile(mode="wt") as f:
+- f.write("invalid file")
+- f.seek(0)
+- with patch("sys.argv", self.args + ["-R", "StrReporter", f.name]):
++ with tempfile.NamedTemporaryFile(mode="wt") as file:
++ file.write("invalid file")
++ file.seek(0)
++ with patch("sys.argv", self.args + ["-R", "StrReporter", file.name]):
+ with pytest.raises(SystemExit) as excinfo:
+ self.script()
+ out, err = capsys.readouterr()
+ assert err.strip() == "pkgcheck replay: error: invalid or unsupported replay file"
+ assert excinfo.value.code == 2
+
+- def test_replay_pipe_stdin(self):
+- script = pytest.REPO_ROOT / "bin/pkgcheck"
+- result = ProfileWarning("profile warning: foo")
+- with tempfile.NamedTemporaryFile() as f:
+- out = PlainTextFormatter(f)
++ def test_replay_pipe_stdin(self, capsys):
++ with tempfile.NamedTemporaryFile() as file:
++ out = PlainTextFormatter(file)
+ with JsonStream(out) as reporter:
+- reporter.report(result)
+- f.seek(0)
+- p = subprocess.run(
+- [script, "replay", "-R", "StrReporter", "-"], stdin=f, stdout=subprocess.PIPE
+- )
+- assert p.stdout.decode() == "profile warning: foo\n"
+- assert p.returncode == 0
++ reporter.report(ProfileWarning("profile warning: foo"))
++ file.seek(0)
++
++ with open(file.name) as stdin, patch("sys.stdin", stdin), patch(
++ "sys.argv", [*self.args, "-R", "StrReporter", "-"]
++ ), pytest.raises(SystemExit) as excinfo:
++ self.script()
++ out, err = capsys.readouterr()
++ assert not err
++ assert out == "profile warning: foo\n"
++ assert excinfo.value.code == 0
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild
index 45516db85496..c3d2532fb01c 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild
@@ -55,6 +55,10 @@ BDEPEND="${RDEPEND}
)
"
+PATCHES=(
+ "${FILESDIR}/${P}-fix-replay-bin.patch"
+)
+
SITEFILE="50${PN}-gentoo.el"
distutils_enable_tests pytest
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgcheck/, dev-util/pkgcheck/files/
@ 2023-02-03 12:52 Arthur Zamarin
0 siblings, 0 replies; 6+ messages in thread
From: Arthur Zamarin @ 2023-02-03 12:52 UTC (permalink / raw
To: gentoo-commits
commit: 085098cf15168729f16bcc4fa735dab8aab5f33a
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 3 12:51:15 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 3 12:51:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=085098cf
dev-util/pkgcheck: fix for newer setuptools
This new patch affects only the build system, so those that have
pkgcheck already installed have no issues, but those trying to build
it with newer setuptools will fail => no revbump is needed.
Closes: https://bugs.gentoo.org/892938
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.../files/pkgcheck-0.10.19-fix-setup.patch | 22 ++++++++++++++++++++++
dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild | 6 +++++-
dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild | 3 ++-
dev-util/pkgcheck/pkgcheck-0.10.20.ebuild | 1 +
4 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-setup.patch b/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-setup.patch
new file mode 100644
index 000000000000..8366e435a1e9
--- /dev/null
+++ b/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-setup.patch
@@ -0,0 +1,22 @@
+https://github.com/pkgcore/pkgcheck/commit/b4c34a95f4c66db9c658f6dd75d9193c6e55dab4
+
+--- a/setup.py
++++ b/setup.py
+@@ -36,12 +36,12 @@ class build_treesitter(Command, SubCommand):
+ pass
+
+ def get_source_files(self):
+- cwd = Path(__file__).parent / "tree-sitter-bash/src"
++ src = "tree-sitter-bash/src/"
+ return [
+- str(cwd / "GNUmakefile"),
+- str(cwd / "tree_sitter/parser.h"),
+- str(cwd / "parser.c"),
+- str(cwd / "scanner.cc"),
++ src + "GNUmakefile",
++ src + "tree_sitter/parser.h",
++ src + "parser.c",
++ src + "scanner.cc",
+ ]
+
+ library_path = Path(__file__).parent / "src/pkgcheck/bash/lang.so"
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild
index fdc0630f0197..0ead2a88c1b6 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -55,6 +55,10 @@ BDEPEND="${RDEPEND}
)
"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.10.19-fix-setup.patch"
+)
+
SITEFILE="50${PN}-gentoo.el"
distutils_enable_tests pytest
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild
index e8ce5bc43086..7bdb06bfcbfd 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -57,6 +57,7 @@ BDEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${P}-fix-pkgcore-0.12.18.patch"
+ "${FILESDIR}/${PN}-0.10.19-fix-setup.patch"
)
SITEFILE="50${PN}-gentoo.el"
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild
index ee894bade2d1..ca8e001c8437 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild
@@ -57,6 +57,7 @@ BDEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${P}-fix-replay-bin.patch"
+ "${FILESDIR}/${PN}-0.10.19-fix-setup.patch"
)
SITEFILE="50${PN}-gentoo.el"
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgcheck/, dev-util/pkgcheck/files/
@ 2023-03-04 18:23 Arthur Zamarin
0 siblings, 0 replies; 6+ messages in thread
From: Arthur Zamarin @ 2023-03-04 18:23 UTC (permalink / raw
To: gentoo-commits
commit: 1a279942bfe72b50aa5dbc561ab091432fc9ec97
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 4 18:22:53 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 4 18:22:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a279942
dev-util/pkgcheck: fix for renamed python scm packages
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.../pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch | 37 ++++++++++++++++++++++
...k-0.10.21.ebuild => pkgcheck-0.10.21-r1.ebuild} | 4 +++
...k-0.10.22.ebuild => pkgcheck-0.10.22-r1.ebuild} | 4 +++
3 files changed, 45 insertions(+)
diff --git a/dev-util/pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch b/dev-util/pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch
new file mode 100644
index 000000000000..387da2374107
--- /dev/null
+++ b/dev-util/pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch
@@ -0,0 +1,37 @@
+diff --git a/src/pkgcheck/checks/python.py b/src/pkgcheck/checks/python.py
+index 291a56b4..19b87ef5 100644
+--- a/src/pkgcheck/checks/python.py
++++ b/src/pkgcheck/checks/python.py
+@@ -234,16 +234,16 @@ class PythonAnyMismatchedDepHasVersionCheck(results.VersionResult, results.Warni
+
+
+ class PythonMissingSCMDependency(results.VersionResult, results.Warning):
+- """Package is missing BDEPEND on setuptools_scm or alike.
++ """Package is missing BDEPEND on setuptools-scm or alike.
+
+ Packages which define ``SETUPTOOLS_SCM_PRETEND_VERSION`` should BDEPEND
+- on ``dev-python/setuptools_scm`` or a similar package [#]_.
++ on ``dev-python/setuptools-scm`` or a similar package [#]_.
+
+ .. [#] https://projects.gentoo.org/python/guide/distutils.html#setuptools-scm-flit-scm-hatch-vcs-and-snapshots
+ """
+
+ desc = (
+- "defines SETUPTOOLS_SCM_PRETEND_VERSION but is missing BDEPEND on setuptools_scm or alike"
++ "defines SETUPTOOLS_SCM_PRETEND_VERSION but is missing BDEPEND on setuptools-scm or alike"
+ )
+
+
+@@ -291,8 +291,10 @@ class PythonCheck(Check):
+
+ setuptools_scm = frozenset(
+ {
+- "dev-python/setuptools_scm",
+- "dev-python/flit_scm",
++ "dev-python/setuptools-scm",
++ "dev-python/setuptools_scm", # legacy old name
++ "dev-python/flit-scm",
++ "dev-python/flit_scm", # legacy old name
+ "dev-python/hatch-vcs",
+ }
+ )
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.21.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.21-r1.ebuild
similarity index 97%
rename from dev-util/pkgcheck/pkgcheck-0.10.21.ebuild
rename to dev-util/pkgcheck/pkgcheck-0.10.21-r1.ebuild
index 66e807c20cc1..6c5f4ff38cef 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.21.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.21-r1.ebuild
@@ -55,6 +55,10 @@ BDEPEND="${RDEPEND}
)
"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.10.21-fix-scm.patch"
+)
+
SITEFILE="50${PN}-gentoo.el"
distutils_enable_tests pytest
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.22.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.22-r1.ebuild
similarity index 97%
rename from dev-util/pkgcheck/pkgcheck-0.10.22.ebuild
rename to dev-util/pkgcheck/pkgcheck-0.10.22-r1.ebuild
index 582d6f268d39..00ae8b9e321b 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.22.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.22-r1.ebuild
@@ -55,6 +55,10 @@ BDEPEND="${RDEPEND}
)
"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.10.21-fix-scm.patch"
+)
+
SITEFILE="50${PN}-gentoo.el"
distutils_enable_tests pytest
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-03-04 18:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-09 9:13 [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgcheck/, dev-util/pkgcheck/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2021-08-25 16:55 Michał Górny
2022-08-01 20:39 Sam James
2022-12-31 11:32 Arthur Zamarin
2023-02-03 12:52 Arthur Zamarin
2023-03-04 18:23 Arthur Zamarin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox