From 69dda9099e67171600e43bf9f677965943c1a2619193b6c87920554af7a97f6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 30 Jul 2018 07:32:50 +0000 Subject: [PATCH 1/4] Accepting request 624906 from home:apersaud:branches:devel:languages:python update to latest version OBS-URL: https://build.opensuse.org/request/show/624906 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools_scm?expand=0&rev=26 --- python-setuptools_scm.changes | 25 +++++++++++++++++++++++++ python-setuptools_scm.spec | 5 ++--- setuptools_scm-2.1.0.tar.gz | 3 --- setuptools_scm-3.0.2.tar.gz | 3 +++ 4 files changed, 30 insertions(+), 6 deletions(-) delete mode 100644 setuptools_scm-2.1.0.tar.gz create mode 100644 setuptools_scm-3.0.2.tar.gz diff --git a/python-setuptools_scm.changes b/python-setuptools_scm.changes index 896ab84..86e3214 100644 --- a/python-setuptools_scm.changes +++ b/python-setuptools_scm.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Tue Jul 24 04:53:44 UTC 2018 - arun@gmx.de + +- update to version 3.0.2: + * fix a regression from tag parsing - support for multi-dashed + prefixes - #284 + +- changes from version 3.0.1: + * fix a regression in setuptools_scm.git.parse - reorder arguments + so the positional invocation from before works as expected #281 + +- changes from version 3.0.0: + * introduce pre-commit and use black + * print the origin module to help testing + * switch to src layout (breaking change) + * no longer alias tag and parsed_version in order to support + understanding a version parse failure + * require parse results to be ScmVersion or None (breaking change) + * fix #266 by requiring the prefix word to be a word again (breaking + change as the bug allowed arbitrary prefixes while the original + feature only allowed words") + * introduce a internal config object to allow the configruation fo + tag parsing and prefixes (thanks to @punkadiddle for introducing + it and passing it trough) + ------------------------------------------------------------------- Tue May 15 05:50:53 UTC 2018 - arun@gmx.de diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec index 59f4c3a..e482077 100644 --- a/python-setuptools_scm.spec +++ b/python-setuptools_scm.spec @@ -19,14 +19,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %bcond_with test Name: python-setuptools_scm -Version: 2.1.0 +Version: 3.0.2 Release: 0 Summary: Manage your versions by scm tags License: MIT Group: Development/Languages/Python URL: https://github.com/pypa/setuptools_scm Source: https://files.pythonhosted.org/packages/source/s/setuptools_scm/setuptools_scm-%{version}.tar.gz -BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros Requires: python-setuptools @@ -64,6 +63,6 @@ in scm metadata. It also handles file finders for the supperted scm's. %files %{python_files} %license LICENSE %doc README.rst CHANGELOG.rst -%{python_sitelib}/* +%{python_sitelib}/setuptools_scm* %changelog diff --git a/setuptools_scm-2.1.0.tar.gz b/setuptools_scm-2.1.0.tar.gz deleted file mode 100644 index 45e6bbb..0000000 --- a/setuptools_scm-2.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a767141fecdab1c0b3c8e4c788ac912d7c94a0d6c452d40777ba84f918316379 -size 32776 diff --git a/setuptools_scm-3.0.2.tar.gz b/setuptools_scm-3.0.2.tar.gz new file mode 100644 index 0000000..6d52f0e --- /dev/null +++ b/setuptools_scm-3.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:113cea38b2edba8538b7e608b58cbd7e09bb71b16d968a9b97e36b4805e06d59 +size 34714 From edf8ea4ef6eb0eb892efcf6c2b921b49e8c984ed3fd91691717148ba66ba4b4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 31 Jul 2018 09:18:18 +0000 Subject: [PATCH 2/4] - Version update to 3.0.5: * fix readme * correct the deploy sections OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools_scm?expand=0&rev=27 --- python-setuptools_scm.changes | 7 +++++++ python-setuptools_scm.spec | 7 +++++-- setuptools_scm-3.0.2.tar.gz | 3 --- setuptools_scm-3.0.5.tar.gz | 3 +++ 4 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 setuptools_scm-3.0.2.tar.gz create mode 100644 setuptools_scm-3.0.5.tar.gz diff --git a/python-setuptools_scm.changes b/python-setuptools_scm.changes index 86e3214..e1e2bc0 100644 --- a/python-setuptools_scm.changes +++ b/python-setuptools_scm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 31 09:12:41 UTC 2018 - tchvatal@suse.com + +- Version update to 3.0.5: + * fix readme + * correct the deploy sections + ------------------------------------------------------------------- Tue Jul 24 04:53:44 UTC 2018 - arun@gmx.de diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec index e482077..a3d67ae 100644 --- a/python-setuptools_scm.spec +++ b/python-setuptools_scm.spec @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %bcond_with test Name: python-setuptools_scm -Version: 3.0.2 +Version: 3.0.5 Release: 0 Summary: Manage your versions by scm tags License: MIT @@ -29,14 +29,16 @@ Source: https://files.pythonhosted.org/packages/source/s/setuptools_scm/ BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros Requires: python-setuptools +BuildRequires: fdupes BuildArch: noarch %if %{with test} # Testing requirements +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} BuildRequires: git BuildRequires: mercurial %endif -%if 0%{?suse_version} >= 1000 || 0%{?fedora_version} >= 24 +%if 0%{?suse_version} || 0%{?fedora_version} >= 24 Recommends: git Recommends: mecurial %endif @@ -54,6 +56,7 @@ in scm metadata. It also handles file finders for the supperted scm's. %install %python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} %if %{with test} %check diff --git a/setuptools_scm-3.0.2.tar.gz b/setuptools_scm-3.0.2.tar.gz deleted file mode 100644 index 6d52f0e..0000000 --- a/setuptools_scm-3.0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:113cea38b2edba8538b7e608b58cbd7e09bb71b16d968a9b97e36b4805e06d59 -size 34714 diff --git a/setuptools_scm-3.0.5.tar.gz b/setuptools_scm-3.0.5.tar.gz new file mode 100644 index 0000000..27b53a3 --- /dev/null +++ b/setuptools_scm-3.0.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3edaf4008ee2d01934d8aa0503cfbd9470f941e2e8aa5eb56de33cdaf69ec3c +size 34952 From a456184f9ed39d0e62a47e53dc3e9aaa20bd2c065bffd631a3508a3ea09f3851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 31 Jul 2018 10:03:39 +0000 Subject: [PATCH 3/4] - Add multibuild to run tests in -test package OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools_scm?expand=0&rev=28 --- _multibuild | 3 +++ python-setuptools_scm.changes | 5 +++++ python-setuptools_scm.spec | 9 ++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 _multibuild diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..fcc7b97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + diff --git a/python-setuptools_scm.changes b/python-setuptools_scm.changes index e1e2bc0..e7ea205 100644 --- a/python-setuptools_scm.changes +++ b/python-setuptools_scm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 31 10:03:17 UTC 2018 - tchvatal@suse.com + +- Add multibuild to run tests in -test package + ------------------------------------------------------------------- Tue Jul 31 09:12:41 UTC 2018 - tchvatal@suse.com diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec index a3d67ae..37a82b1 100644 --- a/python-setuptools_scm.spec +++ b/python-setuptools_scm.spec @@ -17,7 +17,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define test 1 +%bcond_without test +%else %bcond_with test +%endif Name: python-setuptools_scm Version: 3.0.5 Release: 0 @@ -37,6 +43,7 @@ BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} BuildRequires: git BuildRequires: mercurial +Requires: this-is-only-for-build-envs %endif %if 0%{?suse_version} || 0%{?fedora_version} >= 24 Recommends: git @@ -60,7 +67,7 @@ in scm metadata. It also handles file finders for the supperted scm's. %if %{with test} %check -%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_bin_suffix} +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_bin_suffix} -v -k 'not (test_pip_download or test_old_setuptools_fails or test_old_setuptools_allows_with_warnings or test_distlib_setuptools_works)' %endif %files %{python_files} From fbe06ebb477e960242c3830cfd934843f8feaee5a1a2395e5c0722ca6b666082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 1 Aug 2018 07:28:38 +0000 Subject: [PATCH 4/4] - Update to 3.0.6: * Solves issue with wrong version in egg-info OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools_scm?expand=0&rev=29 --- python-setuptools_scm.changes | 6 ++++++ python-setuptools_scm.spec | 2 +- setuptools_scm-3.0.5.tar.gz | 3 --- setuptools_scm-3.0.6.tar.gz | 3 +++ 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 setuptools_scm-3.0.5.tar.gz create mode 100644 setuptools_scm-3.0.6.tar.gz diff --git a/python-setuptools_scm.changes b/python-setuptools_scm.changes index e7ea205..7c58e73 100644 --- a/python-setuptools_scm.changes +++ b/python-setuptools_scm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 1 07:27:53 UTC 2018 - tchvatal@suse.com + +- Update to 3.0.6: + * Solves issue with wrong version in egg-info + ------------------------------------------------------------------- Tue Jul 31 10:03:17 UTC 2018 - tchvatal@suse.com diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec index 37a82b1..c3aaa8e 100644 --- a/python-setuptools_scm.spec +++ b/python-setuptools_scm.spec @@ -25,7 +25,7 @@ %bcond_with test %endif Name: python-setuptools_scm -Version: 3.0.5 +Version: 3.0.6 Release: 0 Summary: Manage your versions by scm tags License: MIT diff --git a/setuptools_scm-3.0.5.tar.gz b/setuptools_scm-3.0.5.tar.gz deleted file mode 100644 index 27b53a3..0000000 --- a/setuptools_scm-3.0.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3edaf4008ee2d01934d8aa0503cfbd9470f941e2e8aa5eb56de33cdaf69ec3c -size 34952 diff --git a/setuptools_scm-3.0.6.tar.gz b/setuptools_scm-3.0.6.tar.gz new file mode 100644 index 0000000..b2bdec0 --- /dev/null +++ b/setuptools_scm-3.0.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9cd4250443f96947c35e4790513fc008b7cc91c1475b8b523e7c7dd69766437 +size 35000