diff --git a/add-rpmfail-pytest-markers.patch b/add-rpmfail-pytest-markers.patch deleted file mode 100644 index 565f64d..0000000 --- a/add-rpmfail-pytest-markers.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: setuptools_scm-3.3.3/testing/test_regressions.py -=================================================================== ---- setuptools_scm-3.3.3.orig/testing/test_regressions.py -+++ setuptools_scm-3.3.3/testing/test_regressions.py -@@ -49,6 +49,7 @@ def test_pip_egg_info(tmpdir, monkeypatc - assert get_version(root=p.strpath, fallback_root=p.strpath) == "1.0" - - -+@pytest.mark.xfail(reason="github connection") - @pytest.mark.issue(164) - def test_pip_download(tmpdir, monkeypatch): - monkeypatch.chdir(tmpdir) -Index: setuptools_scm-3.3.3/testing/test_setuptools_support.py -=================================================================== ---- setuptools_scm-3.3.3.orig/testing/test_setuptools_support.py -+++ setuptools_scm-3.3.3/testing/test_setuptools_support.py -@@ -65,12 +65,14 @@ def check(packagedir, expected_version, - ) - - -+@pytest.mark.xfail(reason="github connection") - def test_old_setuptools_fails(get_setuptools_packagedir): - packagedir = get_setuptools_packagedir("0.9.8") - with pytest.raises(subprocess.CalledProcessError): - check(packagedir, "0.9.8") - - -+@pytest.mark.xfail(reason="github connection") - def test_old_setuptools_allows_with_warnings(get_setuptools_packagedir): - - packagedir = get_setuptools_packagedir("0.9.8") -@@ -78,6 +80,7 @@ def test_old_setuptools_allows_with_warn - check(packagedir, "0.9.8", PYTHONWARNINGS="once::Warning") - - -+@pytest.mark.xfail(reason="github connection") - def test_distlib_setuptools_works(get_setuptools_packagedir): - packagedir = get_setuptools_packagedir("12.0.1") - check(packagedir, "12.0.1") diff --git a/python-setuptools_scm.changes b/python-setuptools_scm.changes index 505bf38..e7a6b3b 100644 --- a/python-setuptools_scm.changes +++ b/python-setuptools_scm.changes @@ -1,3 +1,105 @@ +------------------------------------------------------------------- +Sun Oct 3 19:23:29 UTC 2021 - Ben Greiner + +- Update to 6.3.3 + * only put minimal setuptools version into toml extra to warn + people with old strict pins +- Release 6.3.2 + * fix #629: correctly convert Version data in tags_to_version + parser to avoid errors +- Release 6.3.1 + * fix #625: restore tomli in install_requires after the + regression changes in took it out and some users never added + it even tho they have pyproject.toml files +- Release 6.3.0 + * Warning + This release explicitly warns on unsupported setuptools. This + unfortunately has to happen as the legacy setup_requires + mechanism incorrectly configures the setuptools working-set + when a more recent setuptools version than available is + required. + As all releases of setuptools are affected as the historic + mechanism for ensuring a working setuptools setup was shipping + a ez_setup file next to setup.py, which would install the + required version of setuptools. + This mechanism has long since been deprecated and removed as + most people haven't been using it + * fix #612: depend on packaging to ensure version parsing parts + * fix #611: correct the typo that hid away the toml extra and + add it in setup.py as well + * fix #615: restore support for the git_archive plugin which + doesn't pass over the config + * restore the ability to run on old setuptools while to avoid + breaking pipelines +- Release 6.2.0 + * fix #608: resolve tomli dependency issue by making it a hard + dependency as all intended/supported install options use pip/ + wheel this is only a feature release + * ensure python 3.10 works +- Release 6.1.1 + * fix #605: completely disallow bdist_egg - modern enough + setuptools>=45 uses pip + * fix #606: re-integrate and harden toml parsing + * fix #597: harden and expand support for figuring the current + distribution name from pyproject.toml (project.name or tool. + setuptools_scm.dist_name) section or setup.cfg (metadata.name) +- Release 6.1.0 + * fix #587: don't fail file finders when distribution is not + given + * fix #524: new parameters normalize and version_cls to + customize the version normalization class. + * fix #585: switch from toml to tomli for toml 1.0 support + * fix #591: allow to opt in for searching parent directories in + the api + * fix #589: handle yaml encoding using the expected defaults + * fix #575: recommend storing the version_module inside of mypkg/ + _version.py + * fix #571: accept branches starting with v as release branches + * fix #557: Use packaging.version for version_tuple + * fix #544: enhance errors on unsupported python/setuptools + versions +- Release v6.0.1 + * fix #537: drop node_date on old git to avoid errors on missing + %cI + * v6.0.0 + * fix #517: drop dead python support >3.6 required + * drop dead setuptools support > 45 required (can install wheels) + * drop egg building (use wheels) + * add git node_date metadata to get the commit time-stamp of HEAD + * allow version schemes to be priority ordered lists of version + schemes + * support for calendar versioning (calver) by date +- Release v5.0.2 + * fix #415: use git for matching prefixes to support the windows + situation +- Release v5.0.1 + * fix #509: support + SETUPTOOLS_SCM_PRETEND_VERSION_FOR_${DISTRIBUTION_NAME} for + pyproject.toml +- Release 5.0.0 + * fix #339: strict errors on missing scms when parsing a scm dir + to avoid false version lookups + * fix #337: if relative_to is a directory instead of a file, + consider it as direct target instead of the containing folder + and print a warning + * fix #352: add support for generally ignoring specific vcs roots + * fix #471: better error for version bump failing on complex but + accepted tag + * fix #479: raise indicative error when tags carry non-parsable + information + * Add no-guess-dev which does no next version guessing, just + adds .post1.devN in case there are new commits after the tag + * add python3.9 + * enhance documentation + * consider SOURCE_DATE_EPOCH for versioning + * add a version_tuple to write_to templates + * fix #321: add support for the + SETUPTOOLS_SCM_PRETEND_VERSION_FOR_${DISTRIBUTION_NAME} env + var to target the pretend key + * fix #142: clearly list supported scm + * fix #213: better error message for non-zero dev numbers in tags + * fix #356: add git branch to version on describe failure + ------------------------------------------------------------------- Tue Jan 12 10:07:27 UTC 2021 - Markéta Machová diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec index affada4..d0894be 100644 --- a/python-setuptools_scm.spec +++ b/python-setuptools_scm.spec @@ -1,5 +1,5 @@ # -# spec file for package python-setuptools_scm +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -16,7 +16,7 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%{?!python_module:%define python_module() python3-%{**}} %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %define psuffix -test @@ -25,27 +25,29 @@ %define psuffix %{nil} %bcond_with test %endif +%define skip_python2 1 Name: python-setuptools_scm%{psuffix} -Version: 4.1.2 +Version: 6.3.2 Release: 0 Summary: Python setuptools handler for SCM tags License: MIT URL: https://github.com/pypa/setuptools_scm Source: https://files.pythonhosted.org/packages/source/s/setuptools_scm/setuptools_scm-%{version}.tar.gz -Patch0: add-rpmfail-pytest-markers.patch -BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module packaging >= 20.0} +BuildRequires: %{python_module setuptools >= 45} +BuildRequires: %{python_module tomli >= 1.0} BuildRequires: fdupes BuildRequires: python-rpm-macros +Requires: python-packaging >= 20.0 Requires: python-setuptools -Suggests: python-toml +Requires: python-tomli BuildArch: noarch %if %{with test} # Testing requirements BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module setuptools >= 42} BuildRequires: %{python_module setuptools_scm = %{version}} -BuildRequires: %{python_module toml} +BuildRequires: %{python_module virtualenv} BuildRequires: git-core BuildRequires: mercurial %endif @@ -61,7 +63,6 @@ in SCM metadata. It also handles file finders for the supperted SCMs. %prep %setup -q -n setuptools_scm-%{version} %autopatch -p1 -sed -i 's/yield_fixture/fixture/' testing/conftest.py %build %python_build @@ -74,16 +75,16 @@ sed -i 's/yield_fixture/fixture/' testing/conftest.py %if %{with test} %check -# both tests in test_integration.py encounter https://github.com/pypa/setuptools_scm/issues/386 (at least on Python 2) -# ignore unraisable exceptions (basically https://github.com/pypa/setuptools_scm/commit/cf54011725bb5e6ac9911b06e23ffc5c2938a53f) -%pytest -p no:unraisableexception -k 'not test_integration' +# pip download needs network +%pytest -k "not test_pip_download" %endif %if !%{with test} %files %{python_files} %license LICENSE %doc README.rst CHANGELOG.rst -%{python_sitelib}/setuptools_scm* +%{python_sitelib}/setuptools_scm +%{python_sitelib}/setuptools_scm-%{version}*-info %endif %changelog diff --git a/setuptools_scm-4.1.2.tar.gz b/setuptools_scm-4.1.2.tar.gz deleted file mode 100644 index 4d0968f..0000000 --- a/setuptools_scm-4.1.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a8994582e716ec690f33fec70cca0f85bd23ec974e3f783233e4879090a7faa8 -size 48784 diff --git a/setuptools_scm-6.3.2.tar.gz b/setuptools_scm-6.3.2.tar.gz new file mode 100644 index 0000000..4a6e4bc --- /dev/null +++ b/setuptools_scm-6.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a49aa8081eeb3514eb9728fa5040f2eaa962d6c6f4ec9c32f6c1fba88f88a0f2 +size 57207