* [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgcheck/files/
@ 2022-08-16 18:13 Ulrich Müller
0 siblings, 0 replies; 3+ messages in thread
From: Ulrich Müller @ 2022-08-16 18:13 UTC (permalink / raw
To: gentoo-commits
commit: 5920026ef4a3ede63667ed6856bbcc81dde7b322
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 18:07:09 2022 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 18:13:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5920026e
dev-util/pkgcheck: Don't enable flycheck-pkgcheck-setup in site-emacs
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
dev-util/pkgcheck/files/50pkgcheck-gentoo.el | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-util/pkgcheck/files/50pkgcheck-gentoo.el b/dev-util/pkgcheck/files/50pkgcheck-gentoo.el
index 7808713be94a..003b67dfa9a9 100644
--- a/dev-util/pkgcheck/files/50pkgcheck-gentoo.el
+++ b/dev-util/pkgcheck/files/50pkgcheck-gentoo.el
@@ -1,4 +1,3 @@
(add-to-list 'load-path "@SITELISP@")
(autoload 'flycheck-pkgcheck-setup "flycheck-pkgcheck"
"Flycheck pkgcheck setup." t)
-(add-hook 'ebuild-mode-hook 'flycheck-pkgcheck-setup)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgcheck/files/
@ 2023-03-16 17:38 Arthur Zamarin
0 siblings, 0 replies; 3+ messages in thread
From: Arthur Zamarin @ 2023-03-16 17:38 UTC (permalink / raw
To: gentoo-commits
commit: 2394335af06761104a52bade4ac935f0a80f20bb
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Mar 16 17:16:06 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 17:37:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2394335a
dev-util/pkgcheck: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30155
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.../pkgcheck-0.10.19-fix-pkgcore-0.12.18.patch | 65 ------------
.../files/pkgcheck-0.10.19-fix-setup.patch | 22 -----
.../files/pkgcheck-0.10.20-fix-replay-bin.patch | 109 ---------------------
3 files changed, 196 deletions(-)
diff --git a/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-pkgcore-0.12.18.patch b/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-pkgcore-0.12.18.patch
deleted file mode 100644
index c2c452c42c7f..000000000000
--- a/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-pkgcore-0.12.18.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -8,8 +8,8 @@ requires = [
- "lxml",
- "pathspec",
- "tree-sitter>=0.19.0",
-- "snakeoil~=0.10.3",
-- "pkgcore~=0.12.17",
-+ "snakeoil~=0.10.4",
-+ "pkgcore~=0.12.18",
- ]
- build-backend = "setuptools.build_meta"
-
-@@ -40,8 +40,8 @@ dependencies = [
- "lxml",
- "pathspec",
- "tree-sitter>=0.19.0",
-- "snakeoil~=0.10.3",
-- "pkgcore~=0.12.17",
-+ "snakeoil~=0.10.4",
-+ "pkgcore~=0.12.18",
- ]
-
- [project.optional-dependencies]
-@@ -53,7 +53,7 @@ test = [
- doc = [
- "sphinx",
- "tomli; python_version < '3.11'",
-- "snakeoil~=0.10.3",
-+ "snakeoil~=0.10.4",
- ]
- network = [
- "requests",
---- a/src/pkgcheck/checks/metadata.py
-+++ b/src/pkgcheck/checks/metadata.py
-@@ -210,11 +210,10 @@ class IuseCheck(Check):
- def __init__(self, *args, use_addon):
- super().__init__(*args)
- self.iuse_handler = use_addon
-- self.valid_use = atom_mod.valid_use_flag.match
- self.bad_defaults = tuple(['-'] + [f'+{x}_' for x in self.use_expand_groups])
-
- def feed(self, pkg):
-- if invalid := sorted(x for x in pkg.iuse_stripped if not self.valid_use(x)):
-+ if invalid := sorted(x for x in pkg.iuse_stripped if not pkg.eapi.is_valid_use_flag(x)):
- yield InvalidUseFlags(invalid, pkg=pkg)
-
- if pkg.eapi.options.iuse_defaults and (bad_defaults := sorted(
---- a/testdata/data/repos/standalone/SourcingCheck/InvalidEapi/expected.json
-+++ b/testdata/data/repos/standalone/SourcingCheck/InvalidEapi/expected.json
-@@ -1,2 +1,2 @@
- {"__class__": "InvalidEapi", "category": "SourcingCheck", "package": "InvalidEapi", "version": "0", "attr": "eapi", "msg": "EAPI '9999' is not supported"}
--{"__class__": "InvalidEapi", "category": "SourcingCheck", "package": "InvalidEapi", "version": "1", "attr": "eapi", "msg": "invalid EAPI: 'invalid!'"}
-+{"__class__": "InvalidEapi", "category": "SourcingCheck", "package": "InvalidEapi", "version": "1", "attr": "eapi", "msg": "invalid EAPI 'invalid!'"}
---- a/tests/checks/test_metadata.py
-+++ b/tests/checks/test_metadata.py
-@@ -430,7 +430,7 @@ class TestSourcingCheck(misc.ReportTestCase, misc.Tmpdir):
- """))
- r = self.assertReport(check, self.repo)
- assert isinstance(r, metadata.InvalidEapi)
-- assert f"invalid EAPI: '{eapi}'" in str(r)
-+ assert f"invalid EAPI '{eapi}'" in str(r)
-
- def test_sourcing_error(self):
- check = self.mk_check()
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
deleted file mode 100644
index 8366e435a1e9..000000000000
--- a/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-setup.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/files/pkgcheck-0.10.20-fix-replay-bin.patch b/dev-util/pkgcheck/files/pkgcheck-0.10.20-fix-replay-bin.patch
deleted file mode 100644
index e20c0b3f53f5..000000000000
--- a/dev-util/pkgcheck/files/pkgcheck-0.10.20-fix-replay-bin.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgcheck/files/
@ 2023-04-18 13:41 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2023-04-18 13:41 UTC (permalink / raw
To: gentoo-commits
commit: 66d0c12233c3edce6b02c8c790097a3cd0b2c91d
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Apr 9 08:22:50 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 13:40:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66d0c122
dev-util/pkgcheck: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30527
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch | 37 ----------------------
1 file changed, 37 deletions(-)
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
deleted file mode 100644
index 387da2374107..000000000000
--- a/dev-util/pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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",
- }
- )
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-18 13:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-18 13:41 [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgcheck/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2023-03-16 17:38 Arthur Zamarin
2022-08-16 18:13 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox