From dae306a8bea8f8c1af741114cc126940c3d7d31e01e60e8635a02466f68905c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 7 Aug 2018 07:20:00 +0000 Subject: [PATCH 1/4] - Fix the multibuild code OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools_scm?expand=0&rev=31 --- python-setuptools_scm.changes | 5 +++++ python-setuptools_scm.spec | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/python-setuptools_scm.changes b/python-setuptools_scm.changes index 7c58e73..03fca47 100644 --- a/python-setuptools_scm.changes +++ b/python-setuptools_scm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 7 07:19:37 UTC 2018 - tchvatal@suse.com + +- Fix the multibuild code + ------------------------------------------------------------------- Wed Aug 1 07:27:53 UTC 2018 - tchvatal@suse.com diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec index c3aaa8e..692f145 100644 --- a/python-setuptools_scm.spec +++ b/python-setuptools_scm.spec @@ -24,7 +24,11 @@ %else %bcond_with test %endif +%if %{with test} +Name: python-setuptools_scm-%{flavor} +%else Name: python-setuptools_scm +%endif Version: 3.0.6 Release: 0 Summary: Manage your versions by scm tags @@ -43,7 +47,6 @@ 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 @@ -62,8 +65,10 @@ in scm metadata. It also handles file finders for the supperted scm's. %python_build %install +%if !%{with test} %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +%endif %if %{with test} %check @@ -72,7 +77,9 @@ in scm metadata. It also handles file finders for the supperted scm's. %files %{python_files} %license LICENSE +%if !%{with test} %doc README.rst CHANGELOG.rst %{python_sitelib}/setuptools_scm* +%endif %changelog From 55f5f08b65e74e3604409990bd8911c1c372d45cf1b7c2e87724043a0376483f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 7 Aug 2018 07:29:17 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools_scm?expand=0&rev=32 --- python-setuptools_scm.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec index 692f145..899e0e8 100644 --- a/python-setuptools_scm.spec +++ b/python-setuptools_scm.spec @@ -45,6 +45,7 @@ BuildArch: noarch # Testing requirements BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} +BuildRequires: %{python_module setuptools_scm = %{version}} BuildRequires: git BuildRequires: mercurial %endif @@ -72,7 +73,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} -v -k 'not (test_pip_download or test_old_setuptools_fails or test_old_setuptools_allows_with_warnings or test_distlib_setuptools_works)' +%python_expand PYTHONPATH=%{$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 5d0c2f39a4699b8aca47bed8291d273b8c41183c31193f17810f94890aa19957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 8 Aug 2018 17:00:48 +0000 Subject: [PATCH 3/4] Accepting request 628186 from home:jengelh:branches:devel:languages:python - Use noun phrase in summary. OBS-URL: https://build.opensuse.org/request/show/628186 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools_scm?expand=0&rev=33 --- python-setuptools_scm.changes | 5 +++++ python-setuptools_scm.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/python-setuptools_scm.changes b/python-setuptools_scm.changes index 03fca47..4ed51fb 100644 --- a/python-setuptools_scm.changes +++ b/python-setuptools_scm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 8 15:54:22 UTC 2018 - jengelh@inai.de + +- Use noun phrase in summary. + ------------------------------------------------------------------- Tue Aug 7 07:19:37 UTC 2018 - tchvatal@suse.com diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec index 899e0e8..ed76673 100644 --- a/python-setuptools_scm.spec +++ b/python-setuptools_scm.spec @@ -31,7 +31,7 @@ Name: python-setuptools_scm %endif Version: 3.0.6 Release: 0 -Summary: Manage your versions by scm tags +Summary: Python setuptools handler for SCM tags License: MIT Group: Development/Languages/Python URL: https://github.com/pypa/setuptools_scm @@ -56,8 +56,8 @@ Recommends: mecurial %python_subpackages %description -The setuptools_scm package handles managing your python package versions -in scm metadata. It also handles file finders for the supperted scm's. +The setuptools_scm package handles managing one's Python package versions +in SCM metadata. It also handles file finders for the supperted SCMs. %prep %setup -q -n setuptools_scm-%{version} From a3c07faa5f3dea5eb6184a5af3a535403be941d00d7491aea5b925f4367f5d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 11 Aug 2018 19:54:22 +0000 Subject: [PATCH 4/4] Accepting request 628782 from home:apersaud:branches:devel:languages:python update to latest version OBS-URL: https://build.opensuse.org/request/show/628782 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools_scm?expand=0&rev=34 --- python-setuptools_scm.changes | 9 +++++++++ python-setuptools_scm.spec | 14 +++++++------- setuptools_scm-3.0.6.tar.gz | 3 --- setuptools_scm-3.1.0.tar.gz | 3 +++ 4 files changed, 19 insertions(+), 10 deletions(-) delete mode 100644 setuptools_scm-3.0.6.tar.gz create mode 100644 setuptools_scm-3.1.0.tar.gz diff --git a/python-setuptools_scm.changes b/python-setuptools_scm.changes index 4ed51fb..6b0e627 100644 --- a/python-setuptools_scm.changes +++ b/python-setuptools_scm.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Aug 11 16:28:16 UTC 2018 - arun@gmx.de + +- update to version 3.1.0: + * fix #297 - correct the invocation in version_from_scm and + deprecate it as its exposed by accident + * fix #298 - handle git file listing on empty repositories + * fix #268 - deprecate ScmVersion.extra + ------------------------------------------------------------------- Wed Aug 8 15:54:22 UTC 2018 - jengelh@inai.de diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec index ed76673..ff84283 100644 --- a/python-setuptools_scm.spec +++ b/python-setuptools_scm.spec @@ -24,12 +24,7 @@ %else %bcond_with test %endif -%if %{with test} -Name: python-setuptools_scm-%{flavor} -%else -Name: python-setuptools_scm -%endif -Version: 3.0.6 +Version: 3.1.0 Release: 0 Summary: Python setuptools handler for SCM tags License: MIT @@ -37,11 +32,16 @@ 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 setuptools} +BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-setuptools -BuildRequires: fdupes BuildArch: noarch %if %{with test} +Name: python-setuptools_scm-%{flavor} +%else +Name: python-setuptools_scm +%endif +%if %{with test} # Testing requirements BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} diff --git a/setuptools_scm-3.0.6.tar.gz b/setuptools_scm-3.0.6.tar.gz deleted file mode 100644 index b2bdec0..0000000 --- a/setuptools_scm-3.0.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9cd4250443f96947c35e4790513fc008b7cc91c1475b8b523e7c7dd69766437 -size 35000 diff --git a/setuptools_scm-3.1.0.tar.gz b/setuptools_scm-3.1.0.tar.gz new file mode 100644 index 0000000..13c5158 --- /dev/null +++ b/setuptools_scm-3.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1191f2a136b5e86f7ca8ab00a97ef7aef997131f1f6d4971be69a1ef387d8b40 +size 35585