From a65a342d358374b9eeaa0a1cde5b773b031d9d8e3fb299fbdcbfb4229998e9c9 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 27 Dec 2023 10:47:01 +0000 Subject: [PATCH] Accepting request 1135087 from home:bnavigator:branches:devel:languages:python - Update to 1.13.5 * [bugfix] Import setuptools before importing distutils. Thanks to @tjni * [bugfix] Move zip-safe option to tool.setuptools section of pyproject.toml. Thanks to @cclecle - Accomodate upstream's usage of reruns: some tag tests fail with commit hashes starting with 0. OBS-URL: https://build.opensuse.org/request/show/1135087 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools-git-versioning?expand=0&rev=13 --- python-setuptools-git-versioning.changes | 11 +++++++++++ python-setuptools-git-versioning.spec | 14 +++++--------- setuptools-git-versioning-1.13.2.obscpio | 3 --- setuptools-git-versioning-1.13.2.tar.xz | 3 --- setuptools-git-versioning-1.13.5.tar.xz | 3 +++ setuptools-git-versioning.obsinfo | 6 +++--- 6 files changed, 22 insertions(+), 18 deletions(-) delete mode 100644 setuptools-git-versioning-1.13.2.obscpio delete mode 100644 setuptools-git-versioning-1.13.2.tar.xz create mode 100644 setuptools-git-versioning-1.13.5.tar.xz diff --git a/python-setuptools-git-versioning.changes b/python-setuptools-git-versioning.changes index 48e7393..0b769b3 100644 --- a/python-setuptools-git-versioning.changes +++ b/python-setuptools-git-versioning.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Dec 25 11:20:47 UTC 2023 - Ben Greiner + +- Update to 1.13.5 + * [bugfix] Import setuptools before importing distutils. Thanks + to @tjni + * [bugfix] Move zip-safe option to tool.setuptools section of + pyproject.toml. Thanks to @cclecle +- Accomodate upstream's usage of reruns: some tag + tests fail with commit hashes starting with 0. + ------------------------------------------------------------------- Fri Jun 9 09:22:01 UTC 2023 - ecsos diff --git a/python-setuptools-git-versioning.spec b/python-setuptools-git-versioning.spec index d8b13e9..2335677 100644 --- a/python-setuptools-git-versioning.spec +++ b/python-setuptools-git-versioning.spec @@ -18,12 +18,13 @@ %{?sle15_python_module_pythons} Name: python-setuptools-git-versioning -Version: 1.13.2 +Version: 1.13.5 Release: 0 Summary: Use git repo data for building a version number according PEP-440 License: MIT URL: https://setuptools-git-versioning.readthedocs.io -# no sdist on PyPI, needs full git metadata for bootstrap, run osc service runall to update +# SourceDist: https://github.com/dolfinus/setuptools-git-versioning +# the sdist on PyPI does not have the tests, we needs full git metadata for bootstrap, run osc service runall to update Source: setuptools-git-versioning-%{version}.tar.xz BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} @@ -31,7 +32,6 @@ BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: git-core -Requires: python-Deprecated Requires: python-packaging Requires: python-setuptools Requires(post): update-alternatives @@ -39,13 +39,13 @@ Requires(postun):update-alternatives Provides: python-setuptools_git_versioning = %{version}-%{release} BuildArch: noarch %if 0%{python_version_nodots} < 311 -Requires: python-toml +Requires: python-toml >= 0.10.2 %endif # SECTION test -BuildRequires: %{python_module Deprecated} BuildRequires: %{python_module build} BuildRequires: %{python_module coverage} BuildRequires: %{python_module packaging} +BuildRequires: %{python_module pytest-rerunfailures} BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} @@ -83,10 +83,6 @@ echo _current_flavor >> .git/info/exclude sed -i '/assert get_version(repo, isolated=True)/d' tests/test_integration/test_config.py # test tries to get a wheel wheel in isolated build env donttest="test_substitution_env" -# short git hash has only 7 characters on i586 -donttest="$donttest or (test_version_file_count_commits and sha)" -# broken under Python 3.11 -donttest="$donttest or test_substitution_timestamp" %pytest -k "not ($donttest)" -n auto %post diff --git a/setuptools-git-versioning-1.13.2.obscpio b/setuptools-git-versioning-1.13.2.obscpio deleted file mode 100644 index e53365a..0000000 --- a/setuptools-git-versioning-1.13.2.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4f5d977a7524b6e0bd1dc1677484446d9213672f3a74ba62d43675bbba20dc6 -size 551436 diff --git a/setuptools-git-versioning-1.13.2.tar.xz b/setuptools-git-versioning-1.13.2.tar.xz deleted file mode 100644 index 4a19d80..0000000 --- a/setuptools-git-versioning-1.13.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d1de06a7a27b3bfc7c0c6c10a515404318ebe2fa36d32b0875c54d1b1d174bb -size 298952 diff --git a/setuptools-git-versioning-1.13.5.tar.xz b/setuptools-git-versioning-1.13.5.tar.xz new file mode 100644 index 0000000..346e91a --- /dev/null +++ b/setuptools-git-versioning-1.13.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27a97d5366a4fd9fa58088b3054ac1ce6f5b6aebe8061f7b4f81f1a17bffc03e +size 313648 diff --git a/setuptools-git-versioning.obsinfo b/setuptools-git-versioning.obsinfo index 6a54b43..1e5160f 100644 --- a/setuptools-git-versioning.obsinfo +++ b/setuptools-git-versioning.obsinfo @@ -1,4 +1,4 @@ name: setuptools-git-versioning -version: 1.13.2 -mtime: 1677441023 -commit: aa578a78397cd8ca51bd389aaee8a274fd1b6274 +version: 1.13.5 +mtime: 1691491394 +commit: 3cd11bcd38f15e2e9b25bee7485e81840f3e16dd