Attachment #242929 for bug #272134

View | Details | Raw Unified | Return to bug 272134
Collapse All | Expand All

Lines 1-5 Link Here

(-)b/devel/py-setuptools_scm/Makefile (-4 / +1 lines)
1	PORTNAME= setuptools_scm	1	PORTNAME= setuptools_scm
2	PORTVERSION= 6.4.2	2	PORTVERSION= 7.1.0
3	CATEGORIES= devel python	3	CATEGORIES= devel python
4	MASTER_SITES= PYPI	4	MASTER_SITES= PYPI
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 33-41 NO_ARCH= yes Link Here
33	post-extract:	33	post-extract:
34	@${MV} ${WRKSRC}/testing/test_setuptools_support.py ${WRKSRC}/testing/test_setuptools_support.py.dist	34	@${MV} ${WRKSRC}/testing/test_setuptools_support.py ${WRKSRC}/testing/test_setuptools_support.py.dist
35		35
36	post-patch:
37	@${REINPLACE_CMD} -e 's\|%%PYTHON_CMD%%\|${PYTHON_CMD}\|' ${WRKSRC}/testing/test_integration.py
38
39	# Note: The test suite requires at least py-pytest >= 6.2.0 due changes to the	36	# Note: The test suite requires at least py-pytest >= 6.2.0 due changes to the
40	# "monkeypatch" functionality. Tests are fine with py-pytest 7.0.0.	37	# "monkeypatch" functionality. Tests are fine with py-pytest 7.0.0.
41	do-test:	38	do-test:

Lines 1-3 Link Here

(-)b/devel/py-setuptools_scm/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1644388030	1	TIMESTAMP = 1687366962
2	SHA256 (setuptools_scm-6.4.2.tar.gz) = 6833ac65c6ed9711a4d5d2266f8024cfa07c533a0e55f4c12f6eff280a5a9e30	2	SHA256 (setuptools_scm-7.1.0.tar.gz) = 6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27
3	SIZE (setuptools_scm-6.4.2.tar.gz) = 61305	3	SIZE (setuptools_scm-7.1.0.tar.gz) = 71904




devel/py-{packaging,pyparsing} in environments where devel/py-setuptools_scm is
already present.

--- setup.cfg.orig	2022-12-17 16:05:44 UTC
+++ setup.cfg
@@ -28,7 +28,6 @@ classifiers = 
 [options]
 packages = find:
 install_requires = 
-	packaging>=20.0
 	setuptools
 	typing-extensions
 	importlib-metadata;python_version < '3.8'

Lines 4-14 Original version (without the check for test sessions) obtained from: Link Here

(-)b/devel/py-setuptools_scm/files/patch-src_setuptools__scm_file__finder__git.py (-4 / +4 lines)
4		4
5	https://github.com/OpenIndiana/oi-userland/commit/7d928fa26c0c5e4c29b4826fe78dc42401730529	5	https://github.com/OpenIndiana/oi-userland/commit/7d928fa26c0c5e4c29b4826fe78dc42401730529
6		6
7	--- src/setuptools_scm/file_finder_git.py.orig 2021-10-20 09:27:26 UTC	7	--- src/setuptools_scm/file_finder_git.py.orig 2022-12-17 16:05:30 UTC
8	+++ src/setuptools_scm/file_finder_git.py	8	+++ src/setuptools_scm/file_finder_git.py
9	@@ -18,7 +18,12 @@ def _git_toplevel(path):	9	@@ -48,7 +48,12 @@ def _git_toplevel(path: str) -> str \| None:
10	stderr=devnull,	10	# ``\\`` is just and escape for `\`
11	)	11	out = cwd[: -len(out)]
12	trace("find files toplevel", out)	12	trace("find files toplevel", out)
13	- return os.path.normcase(os.path.realpath(out.strip()))	13	- return os.path.normcase(os.path.realpath(out.strip()))
14	+ toplevel_path = os.path.normcase(os.path.realpath(out.strip()))	14	+ toplevel_path = os.path.normcase(os.path.realpath(out.strip()))





https://github.com/OpenIndiana/oi-userland/commit/7d928fa26c0c5e4c29b4826fe78dc42401730529

--- src/setuptools_scm/file_finder_hg.py.orig	2022-12-17 16:05:30 UTC
+++ src/setuptools_scm/file_finder_hg.py
@@ -22,7 +22,12 @@ def _hg_toplevel(path: str) -> str | None:
             text=True,
             stderr=subprocess.DEVNULL,
         )
-        return os.path.normcase(os.path.realpath(out.strip()))
+        toplevel_path = os.path.normcase(os.path.realpath(out.strip()))
+        setup_py_path = os.path.join(toplevel_path, "setup.py")




Avoid hardcoded Python binary.

--- testing/test_integration.py.orig	2022-02-10 17:16:34 UTC
+++ testing/test_integration.py
@@ -119,7 +119,7 @@ def test_pretend_version_accepts_bad_string(monkeypatc
     monkeypatch.setenv(PRETEND_KEY, "dummy")
     wd.write("setup.py", SETUP_PY_PLAIN)
     assert wd.get_version(write_to="test.py") == "dummy"
-    assert wd("python setup.py --version") == "0.0.0"
+    assert wd("%%PYTHON_CMD%% setup.py --version") == "0.0.0"
 
 
 def test_own_setup_fails_on_old_python(monkeypatch):

Return to bug 272134

Lines 7-19 This is a workaround to remedy issues with upgrade runs that also update Link Here

(-)b/devel/py-setuptools_scm/files/patch-setup.cfg (-4 / +4 lines)
7	devel/py-{packaging,pyparsing} in environments where devel/py-setuptools_scm is	7	devel/py-{packaging,pyparsing} in environments where devel/py-setuptools_scm is
8	already present.	8	already present.
9		9
10	--- setup.cfg.orig 2021-12-05 20:43:43 UTC	10	--- setup.cfg.orig 2022-12-17 16:05:44 UTC
11	+++ setup.cfg	11	+++ setup.cfg
12	@@ -27,7 +27,6 @@ classifiers =	12	@@ -28,7 +28,6 @@ classifiers =
13	[options]	13	[options]
14	packages = find:	14	packages = find:
15	install_requires =	15	install_requires =
16	- packaging>=20.0	16	- packaging>=20.0
17	setuptools	17	setuptools
18	tomli>=1.0.0 # keep in sync	18	typing-extensions
19	python_requires = >=3.6	19	importlib-metadata;python_version < '3.8'

Removed Link Here

(-)a/devel/py-setuptools_scm/files/patch-testing_test__integration.py (-13 lines)
1	Avoid hardcoded Python binary.
2
3	--- testing/test_integration.py.orig 2022-02-10 17:16:34 UTC
4	+++ testing/test_integration.py
5	@@ -119,7 +119,7 @@ def test_pretend_version_accepts_bad_string(monkeypatc
6	monkeypatch.setenv(PRETEND_KEY, "dummy")
7	wd.write("setup.py", SETUP_PY_PLAIN)
8	assert wd.get_version(write_to="test.py") == "dummy"
9	- assert wd("python setup.py --version") == "0.0.0"
10	+ assert wd("%%PYTHON_CMD%% setup.py --version") == "0.0.0"
11
12
13	def test_own_setup_fails_on_old_python(monkeypatch):