diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2023-02-13 10:28:43 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2023-02-13 10:28:43 +0000 |
| commit | 24ba0e9471cc76a08cbac5fd9678f6e5790e558b (patch) | |
| tree | bac64c13f0a8fa067ca318f50b72188d6ee68b1e /dev-python/hatch-vcs | |
| parent | ace3e90f9f526148a22d7c3a8fc4b6868e409e86 (diff) | |
| download | baldeagleos-repo-24ba0e9471cc76a08cbac5fd9678f6e5790e558b.tar.gz baldeagleos-repo-24ba0e9471cc76a08cbac5fd9678f6e5790e558b.tar.xz baldeagleos-repo-24ba0e9471cc76a08cbac5fd9678f6e5790e558b.zip | |
Adding metadata
Diffstat (limited to 'dev-python/hatch-vcs')
| -rw-r--r-- | dev-python/hatch-vcs/files/hatch-vcs-0.3.0-Work-with-setuptools_scm-7.1-fix-25-26.patch | 32 | ||||
| -rw-r--r-- | dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild | 6 |
2 files changed, 37 insertions, 1 deletions
diff --git a/dev-python/hatch-vcs/files/hatch-vcs-0.3.0-Work-with-setuptools_scm-7.1-fix-25-26.patch b/dev-python/hatch-vcs/files/hatch-vcs-0.3.0-Work-with-setuptools_scm-7.1-fix-25-26.patch new file mode 100644 index 000000000000..919036acd720 --- /dev/null +++ b/dev-python/hatch-vcs/files/hatch-vcs-0.3.0-Work-with-setuptools_scm-7.1-fix-25-26.patch @@ -0,0 +1,32 @@ +From 47364faf5563df0eaa631ed10383817762c6b547 Mon Sep 17 00:00:00 2001 +From: Ben Beasley <code@musicinmybrain.net> +Date: Thu, 5 Jan 2023 18:49:54 -0500 +Subject: [PATCH] Work with setuptools_scm 7.1 (fix #25) (#26) + +Make test_write less brittle (see also #8, #9) so that it works with +_version.py files generated by at least setuptools_scm 7.1, 7.0, and +6.x. +--- + tests/test_build.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/tests/test_build.py b/tests/test_build.py +index 2fde601..7c76343 100644 +--- a/tests/test_build.py ++++ b/tests/test_build.py +@@ -75,8 +75,10 @@ def test_write(new_project_write): + assert os.path.isfile(version_file) + + lines = read_file(version_file).splitlines() +- assert lines[3].startswith(('version =', '__version__ =')) +- assert lines[3].endswith("version = '1.2.3'") ++ version_starts = ('version = ', '__version__ = ') ++ assert any(line.startswith(version_starts) for line in lines) ++ version_line = next(line for line in lines if line.startswith(version_starts)) ++ assert version_line.endswith(" = '1.2.3'") + + + @pytest.mark.skipif(sys.version_info[0] == 2, reason='Depends on fix in 6.4.0 which is Python 3-only') +-- +2.39.1 + diff --git a/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild b/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild index cab6b5b676c8..c485ff0c6302 100644 --- a/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild +++ b/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86" RDEPEND=" >=dev-python/setuptools_scm-6.4.0[${PYTHON_USEDEP}] @@ -31,4 +31,8 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${P}-Work-with-setuptools_scm-7.1-fix-25-26.patch +) + distutils_enable_tests pytest |