.gitignore

@@ -1 +1 @@
-/py-1.5.3.tar.gz
+SOURCES/py-1.8.0.tar.gz

.python-py.metadata

@@ -1 +1 @@
-05b890b22b8ce25ab99aee8e35040bc3f944116e py-1.5.3.tar.gz
+b8c56a3648e05ed92722e1a040b55354d9f9ce84 SOURCES/py-1.8.0.tar.gz

SPECS/python-py.spec

@@ -3,13 +3,13 @@
 %bcond_with docs
 # the testsuite is curremtly not compatible with pytest 3, see
 # https://github.com/pytest-dev/py/issues/104
-%if 0%{?fedora} >= 26 || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} > 7
 %bcond_with tests
 %else
 %bcond_without tests
 %endif
 
-%bcond_without python2
+%bcond_with python2
 %bcond_without python3
 
 %global pytest_version_lb 2.9.0
@@ -18,14 +18,18 @@
 %global srcname py
 
 Name:           python-%{srcname}
-Version:        1.5.3
+Version:        1.8.0
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        Library with cross-python path, ini-parsing, io, code, log facilities
 License:        MIT and Public Domain
 #               main package: MIT, except: doc/style.css: Public Domain
-URL:            http://pylib.readthedocs.io/en/stable/
+URL:            http://py.readthedocs.io/
-Source:         https://files.pythonhosted.org/packages/source/p/%{srcname}/%{srcname}-%{version}.tar.gz
+Source:         %{pypi_source}
 BuildArch:      noarch
+# Exclude i686 arch. Due to a modularity issue it's being added to the
+# x86_64 compose of CRB, but we don't want to ship it at all.
+# See: https://projects.engineering.redhat.com/browse/RCM-72605
+ExcludeArch:    i686
 
 %if %{with tests}
 # needed by the testsuite
@@ -48,6 +52,7 @@ following tools and modules:
 Summary:        Library with cross-python path, ini-parsing, io, code, log facilities
 BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
+BuildRequires:  python2-setuptools_scm
 %if %{with tests}
 BuildRequires:  python2-pytest >= %{pytest_version_lb}, python2-pytest < %{pytest_version_ub}
 %endif # with tests
@@ -70,23 +75,24 @@ following tools and modules:
 
 
 %if %{with python3}
-%package -n python3-%{srcname}
+%package -n python%{python3_pkgversion}-%{srcname}
 Summary:        Library with cross-python path, ini-parsing, io, code, log facilities
-BuildRequires:  python3-devel
+BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python3-setuptools
+BuildRequires:  python%{python3_pkgversion}-setuptools
+BuildRequires:  python%{python3_pkgversion}-rpm-macros
 %if %{with docs}
-BuildRequires:  %{_bindir}/sphinx-build-3
+BuildRequires:  %{_bindir}/sphinx-build
 %endif # with_docs
 %if %{with tests}
-BuildRequires:  python3-pytest >= %{pytest_version_lb}, python3-pytest < %{pytest_version_ub}
+BuildRequires:  python%{python3_pkgversion}-pytest >= %{pytest_version_lb}
+BuildRequires:  python%{python3_pkgversion}-pytest < %{pytest_version_ub}
 %endif # with tests
-Requires:       python3-setuptools
+Requires:       python%{python3_pkgversion}-setuptools
-%{?python_provide:%python_provide python3-%{srcname}}
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
-Provides:       bundled(python3-apipkg) = 1.4
+Provides:       bundled(python%{python3_pkgversion}-apipkg) = 1.4
-Provides:       bundled(python3-iniconfig) = 1.0.0
+Provides:       bundled(python%{python3_pkgversion}-iniconfig) = 1.0.0
-Obsoletes:      platform-python-%{srcname} < %{version}-%{release}
 
-%description -n python3-%{srcname}
+%description -n python%{python3_pkgversion}-%{srcname}
 The py lib is a Python development support library featuring the
 following tools and modules:
 
@@ -100,50 +106,39 @@ following tools and modules:
 
 
 %prep
-%setup -qc -n %{srcname}-%{version}
+%autosetup -n %{srcname}-%{version}
 
 # remove shebangs and fix permissions
-find %{srcname}-%{version} \
+find . \
    -type f -a \( -name '*.py' -o -name 'py.*' \) \
    -exec sed -i '1{/^#!/d}' {} \; \
    -exec chmod u=rw,go=r {} \;
 
-mv %{srcname}-%{version} python2
+# Remove dependency of setuptools-scm
-cp -a python2 python3
+sed -i "/ *use_scm_version=.*,/d" setup.py
-
+sed -i "s/ *setup_requires=.*/version='%{version}',/" setup.py
 
 %build
 %if %{with python2}
-pushd python2
 %py2_build
-popd
 %endif # with python2
 
 %if %{with python3}
-pushd python3
 %py3_build
 %if %{with docs}
-make -C doc html PYTHONPATH=$(pwd) SPHINXBUILD=sphinx-build-3
+make -C doc html PYTHONPATH=$(pwd)
+rm -rf doc/_build/html/.buildinfo
 %endif # with docs
-popd
 %endif # with python3
 
 
 %install
 %if %{with python2}
-pushd python2
 %py2_install
-# remove hidden file
-rm -rf doc/_build/html/.buildinfo
-popd
 %endif # with python2
 
 %if %{with python3}
-pushd python3
 %py3_install
-# remove hidden file
-rm -rf doc/_build/html/.buildinfo
-popd
 %endif # with python3
 
 
@@ -152,19 +147,14 @@ popd
 # disable failing Subversion checks for now
 
 %if %{with python2}
-pushd python2
 PYTHONPATH=%{buildroot}%{python2_sitelib} \
-LC_ALL="en_US.UTF-8" \
+LC_ALL=C.UTF-8 \
 py.test-%{python2_version} -r s -k"-TestWCSvnCommandPath" testing
-popd
 %endif # with python2
 
 %if %{with python3}
-pushd python3
 PYTHONPATH=%{buildroot}%{python3_sitelib} \
-LC_ALL="en_US.UTF-8" \
 py.test-%{python3_version} -r s -k"-TestWCSvnCommandPath" testing
-popd
 %endif # with python3
 
 %endif # with tests
@@ -172,21 +162,21 @@ popd
 
 %if %{with python2}
 %files -n python2-%{srcname}
-%doc python2/CHANGELOG
+%doc CHANGELOG
-%doc python2/README.rst
+%doc README.rst
-%license python2/LICENSE
+%license LICENSE
 %{python2_sitelib}/py-*.egg-info/
 %{python2_sitelib}/py/
 %endif # with python2
 
 
 %if %{with python3}
-%files -n python3-%{srcname}
+%files -n python%{python3_pkgversion}-%{srcname}
-%doc python3/CHANGELOG
+%doc CHANGELOG
-%doc python3/README.rst
+%doc README.rst
-%license python3/LICENSE
+%license LICENSE
 %if %{with docs}
-%doc python3/doc/_build/html
+%doc doc/_build/html
 %endif # with_docs
 %{python3_sitelib}/py-*.egg-info/
 %{python3_sitelib}/py/
@@ -194,23 +184,53 @@ popd
 
 
 %changelog
-* Thu Apr 25 2019 Tomas Orsava <torsava@redhat.com> - 1.5.3-6
+* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 1.8.0-8
-- Bumping due to problems with modular RPM upgrade path
+- Exclude unsupported i686 arch
-- Resolves: rhbz#1695587
 
-* Fri Jul 13 2018 Lumír Balhar <lbalhar@redhat.com> - 1.5.3-5
+* Tue Nov 19 2019 Lumír Balhar <lbalhar@redhat.com> - 1.8.0-7
-- Python 3 subpackage enabled
+- Adjusted for Python 3.8 module in RHEL 8
 
-* Fri Jul 13 2018 Lumír Balhar <lbalhar@redhat.com> - 1.5.3-4
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.8.0-6
-- First version for python27 module
+- Rebuilt for Python 3.8.0rc1 (#1748018)
 
-* Fri Jul 13 2018 Petr Viktorin <pviktori@redhat.com> - 1.5.3-3
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1.8.0-5
-- Disable the Python 2 subpackage
+- Rebuilt for Python 3.8
-  https://bugzilla.redhat.com/show_bug.cgi?id=1590433
 
-* Thu Jun 21 2018 Lumír Balhar <lbalhar@redhat.com> - 1.5.3-2
+* Wed Aug 14 2019 Miro Hrončok <mhroncok@redhat.com> - 1.8.0-4
-- Allow build with Python 2
+- Bootstrap for Python 3.8
-- Remove documentation of Python 2 subpackage
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Apr 15 2019 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.0-1
+- Update to 1.8.0.
+- Update spec file.
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.7.0-2
+- Drop explicit locale setting for python3, use C.UTF-8 for python2
+  See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot
+
+* Sun Nov 11 2018 Thomas Moschny <thomas.moschny@gmx.de> - 1.7.0-1
+- Update to 1.7.0.
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 1.5.4-2
+- Rebuilt for Python 3.7
+
+* Thu Jun 28 2018 Thomas Moschny <thomas.moschny@gmx.de> - 1.5.4-1
+- Update to 1.5.4.
+- Add BR on setuptools_scm.
+
+* Sat Jun 16 2018 Miro Hrončok <mhroncok@redhat.com> - 1.5.3-3
+- Rebuilt for Python 3.7
+
+* Wed Jun 13 2018 Miro Hrončok <mhroncok@redhat.com> - 1.5.3-2
+- Bootstrap for Python 3.7
 
 * Thu Mar 22 2018 Thomas Moschny <thomas.moschny@gmx.de> - 1.5.3-1
 - Update to 1.5.3.

sources

@@ -1 +0,0 @@
-SHA512 (py-1.5.3.tar.gz) = 243c0da94c439163257c525ef00b30fd6d8add5897121ee0b1f19476b50f18823ce2b99a5ab27a9cf47598b538758d0534060123dce0820d2a65d98046548c96