Attachment 242929 Details for Bug 272134 – patch

[patch] patch

py-setuptools_scm.patch (text/plain), 5.28 KB, created by Yuri Victorovich on 2023-06-21 17:08:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2023-06-21 17:08:16 UTC

Size: 5.28 KB

patch

obsolete

>diff --git a/devel/py-setuptools_scm/Makefile b/devel/py-setuptools_scm/Makefile
>index 1b66494c2acc..ffb13b4ce9c1 100644
>--- a/devel/py-setuptools_scm/Makefile
>+++ b/devel/py-setuptools_scm/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	setuptools_scm
>-PORTVERSION=	6.4.2
>+PORTVERSION=	7.1.0
> CATEGORIES=	devel python
> MASTER_SITES=	PYPI
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -33,9 +33,6 @@ NO_ARCH=	yes
> post-extract:
> 	@${MV} ${WRKSRC}/testing/test_setuptools_support.py ${WRKSRC}/testing/test_setuptools_support.py.dist
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' ${WRKSRC}/testing/test_integration.py
>-
> # Note: The test suite requires at least py-pytest >= 6.2.0 due changes to the
> # "monkeypatch" functionality.  Tests are fine with py-pytest 7.0.0.
> do-test:
>diff --git a/devel/py-setuptools_scm/distinfo b/devel/py-setuptools_scm/distinfo
>index 7dd88dc6f785..9fbba45ee502 100644
>--- a/devel/py-setuptools_scm/distinfo
>+++ b/devel/py-setuptools_scm/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1644388030
>-SHA256 (setuptools_scm-6.4.2.tar.gz) = 6833ac65c6ed9711a4d5d2266f8024cfa07c533a0e55f4c12f6eff280a5a9e30
>-SIZE (setuptools_scm-6.4.2.tar.gz) = 61305
>+TIMESTAMP = 1687366962
>+SHA256 (setuptools_scm-7.1.0.tar.gz) = 6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27
>+SIZE (setuptools_scm-7.1.0.tar.gz) = 71904
>diff --git a/devel/py-setuptools_scm/files/patch-setup.cfg b/devel/py-setuptools_scm/files/patch-setup.cfg
>index 023b8f628e4d..ae2f9d063853 100644
>--- a/devel/py-setuptools_scm/files/patch-setup.cfg
>+++ b/devel/py-setuptools_scm/files/patch-setup.cfg
>@@ -7,13 +7,13 @@ This is a workaround to remedy issues with upgrade runs that also update
> devel/py-{packaging,pyparsing} in environments where devel/py-setuptools_scm is
> already present.
> 
>---- setup.cfg.orig	2021-12-05 20:43:43 UTC
>+--- setup.cfg.orig	2022-12-17 16:05:44 UTC
> +++ setup.cfg
>-@@ -27,7 +27,6 @@ classifiers = 
>+@@ -28,7 +28,6 @@ classifiers = 
>  [options]
>  packages = find:
>  install_requires = 
> -	packaging>=20.0
>  	setuptools
>- 	tomli>=1.0.0 # keep in sync
>- python_requires = >=3.6
>+ 	typing-extensions
>+ 	importlib-metadata;python_version < '3.8'
>diff --git a/devel/py-setuptools_scm/files/patch-src_setuptools__scm_file__finder__git.py b/devel/py-setuptools_scm/files/patch-src_setuptools__scm_file__finder__git.py
>index d33a125106b5..839dc3f3417c 100644
>--- a/devel/py-setuptools_scm/files/patch-src_setuptools__scm_file__finder__git.py
>+++ b/devel/py-setuptools_scm/files/patch-src_setuptools__scm_file__finder__git.py
>@@ -4,11 +4,11 @@ Original version (without the check for test sessions) obtained from:
> 
> https://github.com/OpenIndiana/oi-userland/commit/7d928fa26c0c5e4c29b4826fe78dc42401730529
> 
>---- src/setuptools_scm/file_finder_git.py.orig	2021-10-20 09:27:26 UTC
>+--- src/setuptools_scm/file_finder_git.py.orig	2022-12-17 16:05:30 UTC
> +++ src/setuptools_scm/file_finder_git.py
>-@@ -18,7 +18,12 @@ def _git_toplevel(path):
>-                 stderr=devnull,
>-             )
>+@@ -48,7 +48,12 @@ def _git_toplevel(path: str) -> str | None:
>+             # ``\\`` is just and escape for `\`
>+             out = cwd[: -len(out)]
>          trace("find files toplevel", out)
> -        return os.path.normcase(os.path.realpath(out.strip()))
> +        toplevel_path = os.path.normcase(os.path.realpath(out.strip()))
>diff --git a/devel/py-setuptools_scm/files/patch-src_setuptools__scm_file__finder__hg.py b/devel/py-setuptools_scm/files/patch-src_setuptools__scm_file__finder__hg.py
>index 7da5458d484a..1dd613b4559d 100644
>--- a/devel/py-setuptools_scm/files/patch-src_setuptools__scm_file__finder__hg.py
>+++ b/devel/py-setuptools_scm/files/patch-src_setuptools__scm_file__finder__hg.py
>@@ -4,12 +4,12 @@ Original version (without the check for test sessions) obtained from:
> 
> https://github.com/OpenIndiana/oi-userland/commit/7d928fa26c0c5e4c29b4826fe78dc42401730529
> 
>---- src/setuptools_scm/file_finder_hg.py.orig	2021-10-20 09:29:52 UTC
>+--- src/setuptools_scm/file_finder_hg.py.orig	2022-12-17 16:05:30 UTC
> +++ src/setuptools_scm/file_finder_hg.py
>-@@ -13,7 +13,12 @@ def _hg_toplevel(path):
>-                 universal_newlines=True,
>-                 stderr=devnull,
>-             )
>+@@ -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")
>diff --git a/devel/py-setuptools_scm/files/patch-testing_test__integration.py b/devel/py-setuptools_scm/files/patch-testing_test__integration.py
>deleted file mode 100644
>index ea66069479a8..000000000000
>--- a/devel/py-setuptools_scm/files/patch-testing_test__integration.py
>+++ /dev/null
>@@ -1,13 +0,0 @@
>-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):

Flags:

vishwin: maintainer-approval-

Actions: View | Diff

Attachments on bug 272134: 242929