From 8a70ac11ceede03a9d90447e782659fced70e850ec4e9c6b26a3d9ca224b05de Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 13 Mar 2024 10:11:39 +0000 Subject: [PATCH 1/4] - restrit to pydantic 1.x - Update to version 2.1.0 - Update to version 2.0.1 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-versioningit?expand=0&rev=14 --- python-versioningit.changes | 9 +++++++-- python-versioningit.spec | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/python-versioningit.changes b/python-versioningit.changes index 51be277..ec46f89 100644 --- a/python-versioningit.changes +++ b/python-versioningit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 13 10:11:20 UTC 2024 - Dirk Müller + +- restrit to pydantic 1.x + ------------------------------------------------------------------- Sun Feb 12 01:30:01 UTC 2023 - Tejas Guruswamy @@ -8,7 +13,7 @@ Sun Feb 12 01:30:01 UTC 2023 - Tejas Guruswamy ------------------------------------------------------------------- Wed Nov 9 19:36:14 UTC 2022 - Yogalakshmi Arunachalam -- Update to version 2.1.0 +- Update to version 2.1.0 * Drop support for Python 3.6 * Support Python 3.11 * Use tomllib on Python 3.11 @@ -16,7 +21,7 @@ Wed Nov 9 19:36:14 UTC 2022 - Yogalakshmi Arunachalam ------------------------------------------------------------------- Tue Oct 11 16:52:39 UTC 2022 - Yogalakshmi Arunachalam -- Update to version 2.0.1 +- Update to version 2.0.1 * Don't run the onbuild step under setuptools' upcoming PEP 660 editable mode (contributed by @abravalheri) ------------------------------------------------------------------- diff --git a/python-versioningit.spec b/python-versioningit.spec index 1f6549c..da3dc6f 100644 --- a/python-versioningit.spec +++ b/python-versioningit.spec @@ -1,7 +1,7 @@ # # spec file for package python-versioningit # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,7 +38,7 @@ BuildRequires: python3 >= 3.7 # SECTION test requirements BuildRequires: %{python_module packaging} BuildRequires: %{python_module build} -BuildRequires: %{python_module pydantic} +BuildRequires: %{python_module pydantic < 2} BuildRequires: %{python_module pytest-cov} BuildRequires: %{python_module pytest-mock} BuildRequires: %{python_module pytest} @@ -59,7 +59,7 @@ Requires: alts BuildRequires: alts %else Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives %endif BuildArch: noarch %python_subpackages From 96ebf989db0ebe454d49ed2d33be66ddfba1c2ff602790fe6983bd23d566dbaa Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 14 Mar 2024 11:09:18 +0000 Subject: [PATCH 2/4] - update to 3.0.0: * Migrated from setuptools to hatch * Support using the `onbuild` step with Hatch * **Breaking**: The `build_dir` argument passed to `Versioningit.do_onbuild()` * and `onbuild` method callables has been changed to an `OnbuildFileProvider` * ABC OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-versioningit?expand=0&rev=15 --- python-versioningit.changes | 12 ++++++++++++ python-versioningit.spec | 8 ++++---- versioningit-2.2.0.tar.gz | 3 --- versioningit-3.0.0.tar.gz | 3 +++ 4 files changed, 19 insertions(+), 7 deletions(-) delete mode 100644 versioningit-2.2.0.tar.gz create mode 100644 versioningit-3.0.0.tar.gz diff --git a/python-versioningit.changes b/python-versioningit.changes index ec46f89..f9bccfc 100644 --- a/python-versioningit.changes +++ b/python-versioningit.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Mar 14 11:08:49 UTC 2024 - Dirk Müller + +- update to 3.0.0: + * Migrated from setuptools to hatch + * Support using the `onbuild` step with Hatch + * **Breaking**: The `build_dir` argument passed to + `Versioningit.do_onbuild()` + * and `onbuild` method callables has been changed to an + `OnbuildFileProvider` + * ABC + ------------------------------------------------------------------- Wed Mar 13 10:11:20 UTC 2024 - Dirk Müller diff --git a/python-versioningit.spec b/python-versioningit.spec index da3dc6f..54cdd7e 100644 --- a/python-versioningit.spec +++ b/python-versioningit.spec @@ -25,20 +25,20 @@ %endif Name: python-versioningit -Version: 2.2.0 +Version: 3.0.0 Release: 0 Summary: Versioning It with your Version In Git License: MIT URL: https://github.com/jwodder/versioningit Source: https://files.pythonhosted.org/packages/source/v/versioningit/versioningit-%{version}.tar.gz +BuildRequires: %{python_module hatchling} BuildRequires: %{python_module pip} -BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros BuildRequires: python3 >= 3.7 # SECTION test requirements BuildRequires: %{python_module packaging} BuildRequires: %{python_module build} -BuildRequires: %{python_module pydantic < 2} +BuildRequires: %{python_module pydantic} BuildRequires: %{python_module pytest-cov} BuildRequires: %{python_module pytest-mock} BuildRequires: %{python_module pytest} @@ -82,7 +82,7 @@ separate functions used for version extraction & calculation. %python_clone -a %{buildroot}%{_bindir}/versioningit %check -%pytest test -k 'not test_editable_mode' +%pytest test -k 'not test_editable_mode or not test_end2end' %pre %python_libalternatives_reset_alternative versioningit diff --git a/versioningit-2.2.0.tar.gz b/versioningit-2.2.0.tar.gz deleted file mode 100644 index 072b643..0000000 --- a/versioningit-2.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb18e7ba7268a880bf1ccfe92e534e96ab34e0397f28dcbcb3fc0da4f6a5b6bd -size 742936 diff --git a/versioningit-3.0.0.tar.gz b/versioningit-3.0.0.tar.gz new file mode 100644 index 0000000..8b85033 --- /dev/null +++ b/versioningit-3.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e3ce47a6424d850ae9e55e1b134a020e9fcbcb895338f107f2b5c51d34c9c1b +size 203693 From 9efa89789e5a8dc7d412eb75c84df12806108873769d51975193cdc27a9ae0db Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 14 Mar 2024 11:09:40 +0000 Subject: [PATCH 3/4] ------------------------------------------------------------------ OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-versioningit?expand=0&rev=16 --- python-versioningit.changes | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/python-versioningit.changes b/python-versioningit.changes index f9bccfc..4dc0532 100644 --- a/python-versioningit.changes +++ b/python-versioningit.changes @@ -10,12 +10,7 @@ Thu Mar 14 11:08:49 UTC 2024 - Dirk Müller `OnbuildFileProvider` * ABC -------------------------------------------------------------------- -Wed Mar 13 10:11:20 UTC 2024 - Dirk Müller - -- restrit to pydantic 1.x - -------------------------------------------------------------------- +------------------------------------------------------------------ Sun Feb 12 01:30:01 UTC 2023 - Tejas Guruswamy - Update to version 2.2.0 From 764e911076e15332c74166849ec56e887780847e3d16ffcb0f36054a0eff5f21 Mon Sep 17 00:00:00 2001 From: Tejas Guruswamy Date: Fri, 22 Mar 2024 01:51:20 +0000 Subject: [PATCH 4/4] Accepting request 1160049 from home:mcalabkova:branches:devel:languages:python - Update to 3.1.0 * Improve some error messages OBS-URL: https://build.opensuse.org/request/show/1160049 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-versioningit?expand=0&rev=17 --- python-versioningit.changes | 6 ++++++ python-versioningit.spec | 18 +++++++++--------- versioningit-3.0.0.tar.gz | 3 --- versioningit-3.1.0.tar.gz | 3 +++ 4 files changed, 18 insertions(+), 12 deletions(-) delete mode 100644 versioningit-3.0.0.tar.gz create mode 100644 versioningit-3.1.0.tar.gz diff --git a/python-versioningit.changes b/python-versioningit.changes index 4dc0532..499eb11 100644 --- a/python-versioningit.changes +++ b/python-versioningit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 21 08:20:56 UTC 2024 - Markéta Machová + +- Update to 3.1.0 + * Improve some error messages + ------------------------------------------------------------------- Thu Mar 14 11:08:49 UTC 2024 - Dirk Müller diff --git a/python-versioningit.spec b/python-versioningit.spec index 54cdd7e..b2aab93 100644 --- a/python-versioningit.spec +++ b/python-versioningit.spec @@ -16,8 +16,6 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} - %if 0%{?suse_version} > 1500 %bcond_without libalternatives %else @@ -25,24 +23,24 @@ %endif Name: python-versioningit -Version: 3.0.0 +Version: 3.1.0 Release: 0 Summary: Versioning It with your Version In Git License: MIT URL: https://github.com/jwodder/versioningit Source: https://files.pythonhosted.org/packages/source/v/versioningit/versioningit-%{version}.tar.gz +BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module hatchling} BuildRequires: %{python_module pip} BuildRequires: python-rpm-macros -BuildRequires: python3 >= 3.7 # SECTION test requirements -BuildRequires: %{python_module packaging} BuildRequires: %{python_module build} +BuildRequires: %{python_module importlib-metadata if %python-base < 3.10} +BuildRequires: %{python_module packaging} BuildRequires: %{python_module pydantic} BuildRequires: %{python_module pytest-cov} BuildRequires: %{python_module pytest-mock} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module setuptools} BuildRequires: %{python_module tomli >= 1.2} BuildRequires: %{python_module wheel} BuildRequires: git @@ -50,9 +48,10 @@ BuildRequires: mercurial # /SECTION BuildRequires: fdupes Requires: python-packaging -Requires: python-setuptools Requires: python-tomli >= 1.2 -Suggests: python-importlib-metadata >= 3.6 +%if %{?python_version_nodots} < 310 +Requires: python-importlib-metadata >= 3.6 +%endif Suggests: python-dataclasses %if %{with libalternatives} Requires: alts @@ -97,6 +96,7 @@ separate functions used for version extraction & calculation. %doc CHANGELOG.md README.rst %license LICENSE %python_alternative %{_bindir}/versioningit -%{python_sitelib}/* +%{python_sitelib}/versioningit +%{python_sitelib}/versioningit-%{version}*-info %changelog diff --git a/versioningit-3.0.0.tar.gz b/versioningit-3.0.0.tar.gz deleted file mode 100644 index 8b85033..0000000 --- a/versioningit-3.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e3ce47a6424d850ae9e55e1b134a020e9fcbcb895338f107f2b5c51d34c9c1b -size 203693 diff --git a/versioningit-3.1.0.tar.gz b/versioningit-3.1.0.tar.gz new file mode 100644 index 0000000..49022ff --- /dev/null +++ b/versioningit-3.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7aac713c31a53eb367a6bbc2e8b3de8cc2b86d10d45c5101afd651446cb10fd7 +size 215117