From 2441621c887897a69af0afefde79958ca819d6fb Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 29 Jul 2018 18:19:55 -0600 Subject: [PATCH] Update to 3.0.4 Re-enable tests --- .gitignore | 1 + python-setuptools_scm.spec | 33 ++++++++++++++++++--------------- sources | 2 +- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 8247ef0..762e0eb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /setuptools_scm-1.15.6.tar.gz /setuptools_scm-1.15.7.tar.gz /setuptools_scm-2.1.0.tar.gz +/setuptools_scm-3.0.4.tar.gz diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec index 86d130b..c51234a 100644 --- a/python-setuptools_scm.spec +++ b/python-setuptools_scm.spec @@ -1,11 +1,10 @@ -# Tests are not included in PyPI tarball -%bcond_with tests +%bcond_without tests %global srcname setuptools_scm Name: python-%{srcname} -Version: 2.1.0 -Release: 4%{?dist} +Version: 3.0.4 +Release: 1%{?dist} Summary: Blessed package to manage your versions by scm tags # https://github.com/pypa/setuptools_scm/issues/211 @@ -37,17 +36,17 @@ BuildRequires: python2-pytest Setuptools_scm handles managing your python package versions in scm metadata. It also handles file finders for the suppertes scms. -%package -n python3-%{srcname} +%package -n python%{python3_pkgversion}-%{srcname} Summary: %{summary} -BuildRequires: python3-devel -BuildRequires: python3-setuptools +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools %if %{with tests} -BuildRequires: python3-pytest +BuildRequires: python%{python3_pkgversion}-pytest %endif -%{?python_provide:%python_provide python3-%{srcname}} +%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} Obsoletes: platform-python-%{srcname} < %{version}-%{release} -%description -n python3-%{srcname} +%description -n python%{python3_pkgversion}-%{srcname} Setuptools_scm handles managing your python package versions in scm metadata. It also handles file finders for the suppertes scms. @@ -64,23 +63,27 @@ It also handles file finders for the suppertes scms. %if %{with tests} %check -PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-%{python2_version} -vv -PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} -vv +PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-%{python2_version} -v -k 'not (test_pip_download or test_old_setuptools_fails or test_old_setuptools_allows_with_warnings or test_distlib_setuptools_works)' +PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-%{python3_version} -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 -n python2-%{srcname} -#license LICENSE +%license LICENSE %doc README.rst %{python2_sitelib}/%{srcname}/ %{python2_sitelib}/%{srcname}-*.egg-info/ -%files -n python3-%{srcname} -#license LICENSE +%files -n python%{python3_pkgversion}-%{srcname} +%license LICENSE %doc README.rst %{python3_sitelib}/%{srcname}/ %{python3_sitelib}/%{srcname}-*.egg-info %changelog +* Sun Jul 29 2018 Orion Poplawski - 3.0.4-1 +- Update to 3.0.4 +- Re-enable tests + * Sat Jul 14 2018 Fedora Release Engineering - 2.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 1d1bde4..623c82e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (setuptools_scm-2.1.0.tar.gz) = 69ce171aa4d3b576883efffb350c59f38bfe8b35bd8e4e8fa1128d9f8a3e6cfaab832633e91fada36126f8e7e2c18663fad621d62c9834be1b5d36c58ae1d1c8 +SHA512 (setuptools_scm-3.0.4.tar.gz) = a41dd09cf065fb7a00898d32e324044c86ddd5211d4aea09e77de76716810c20e0872a5b166646e348e197aefb9aaac744e62d03738845efd0ff65cf17186f48