.gitignore

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

.python-py.metadata

@@ -1 +1 @@
-b8c56a3648e05ed92722e1a040b55354d9f9ce84 SOURCES/py-1.8.0.tar.gz
+690e4e3dcaeafe02ad4af36233148e7e10032d1a SOURCES/py-1.10.0.tar.gz

SPECS/python-py.spec

@@ -1,7 +1,7 @@
 # we have a circular (build) dependency with the (new) pytest package
 # when generating the docs or running the testsuite
-%bcond_with docs
+%bcond_without docs
-# the testsuite is curremtly not compatible with pytest 3, see
+# the testsuite is currently not compatible with pytest 3, see
 # https://github.com/pytest-dev/py/issues/104
 %if 0%{?fedora} || 0%{?rhel} > 7
 %bcond_with tests
@@ -9,27 +9,20 @@
 %bcond_without tests
 %endif
 
-%bcond_with python2
-%bcond_without python3
-
 %global pytest_version_lb 2.9.0
 %global pytest_version_ub 2.10
 
 %global srcname py
 
 Name:           python-%{srcname}
-Version:        1.8.0
+Version:        1.10.0
-Release:        8%{?dist}
+Release:        6%{?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://py.readthedocs.io/
 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
@@ -47,52 +40,25 @@ following tools and modules:
   * py.path: uniform local and svn path objects
 
 
-%if %{with python2}
+%package -n python3-%{srcname}
-%package -n python2-%{srcname}
 Summary:        Library with cross-python path, ini-parsing, io, code, log facilities
-BuildRequires:  python2-devel
+BuildRequires:  python3-devel
-BuildRequires:  python2-setuptools
+BuildRequires:  python3-setuptools
-BuildRequires:  python2-setuptools_scm
+BuildRequires:  python3-setuptools_scm
-%if %{with tests}
-BuildRequires:  python2-pytest >= %{pytest_version_lb}, python2-pytest < %{pytest_version_ub}
-%endif # with tests
-Requires:       python2-setuptools
-%{?python_provide:%python_provide python2-%{srcname}}
-Provides:       bundled(python2-apipkg) = 1.4
-Provides:       bundled(python2-iniconfig) = 1.0.0
-
-%description -n python2-%{srcname}
-The py lib is a Python development support library featuring the
-following tools and modules:
-
-  * py.path: uniform local and svn path objects
-  * py.apipkg: explicit API control and lazy-importing
-  * py.iniconfig: easy parsing of .ini files
-  * py.code: dynamic code generation and introspection
-  * py.path: uniform local and svn path objects
-
-%endif # with python2
-
-
-%if %{with python3}
-%package -n python%{python3_pkgversion}-%{srcname}
-Summary:        Library with cross-python path, ini-parsing, io, code, log facilities
-BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python%{python3_pkgversion}-setuptools
-BuildRequires:  python%{python3_pkgversion}-rpm-macros
 %if %{with docs}
+BuildRequires: make
 BuildRequires:  %{_bindir}/sphinx-build
 %endif # with_docs
 %if %{with tests}
-BuildRequires:  python%{python3_pkgversion}-pytest >= %{pytest_version_lb}
+BuildRequires:  python3-pytest >= %{pytest_version_lb}, python3-pytest < %{pytest_version_ub}
-BuildRequires:  python%{python3_pkgversion}-pytest < %{pytest_version_ub}
 %endif # with tests
-Requires:       python%{python3_pkgversion}-setuptools
+Requires:       python3-setuptools
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
+%{?python_provide:%python_provide python3-%{srcname}}
-Provides:       bundled(python%{python3_pkgversion}-apipkg) = 1.4
+Provides:       bundled(python3-apipkg) = 1.5
-Provides:       bundled(python%{python3_pkgversion}-iniconfig) = 1.0.0
+Provides:       bundled(python3-iniconfig) = 1.1.1
+Obsoletes:      platform-python-%{srcname} < %{version}-%{release}
 
-%description -n python%{python3_pkgversion}-%{srcname}
+%description -n python3-%{srcname}
 The py lib is a Python development support library featuring the
 following tools and modules:
 
@@ -102,8 +68,6 @@ following tools and modules:
   * py.code: dynamic code generation and introspection
   * py.path: uniform local and svn path objects
 
-%endif # with python3
-
 
 %prep
 %autosetup -n %{srcname}-%{version}
@@ -114,65 +78,34 @@ find . \
    -exec sed -i '1{/^#!/d}' {} \; \
    -exec chmod u=rw,go=r {} \;
 
-# Remove dependency of setuptools-scm
-sed -i "/ *use_scm_version=.*,/d" setup.py
-sed -i "s/ *setup_requires=.*/version='%{version}',/" setup.py
 
 %build
-%if %{with python2}
-%py2_build
-%endif # with python2
-
-%if %{with python3}
 %py3_build
 %if %{with docs}
 make -C doc html PYTHONPATH=$(pwd)
 rm -rf doc/_build/html/.buildinfo
 %endif # with docs
-%endif # with python3
 
 
 %install
-%if %{with python2}
-%py2_install
-%endif # with python2
-
-%if %{with python3}
 %py3_install
-%endif # with python3
+
+# Remove bundled dist/egg-info directories, they shouldn't be shipped for
+# bundled modules and in some cases they could confuse automatic generators
+# that read the dist/egg-info data.
+rm -rf %{buildroot}%{python3_sitelib}/py/_vendored_packages/*.{dist,egg}-info
 
 
 %check
 %if %{with tests}
 # disable failing Subversion checks for now
-
-%if %{with python2}
-PYTHONPATH=%{buildroot}%{python2_sitelib} \
-LC_ALL=C.UTF-8 \
-py.test-%{python2_version} -r s -k"-TestWCSvnCommandPath" testing
-%endif # with python2
-
-%if %{with python3}
 PYTHONPATH=%{buildroot}%{python3_sitelib} \
 py.test-%{python3_version} -r s -k"-TestWCSvnCommandPath" testing
-%endif # with python3
-
 %endif # with tests
 
 
-%if %{with python2}
+%files -n python3-%{srcname}
-%files -n python2-%{srcname}
+%doc CHANGELOG.rst
-%doc CHANGELOG
-%doc README.rst
-%license LICENSE
-%{python2_sitelib}/py-*.egg-info/
-%{python2_sitelib}/py/
-%endif # with python2
-
-
-%if %{with python3}
-%files -n python%{python3_pkgversion}-%{srcname}
-%doc CHANGELOG
 %doc README.rst
 %license LICENSE
 %if %{with docs}
@@ -180,15 +113,52 @@ py.test-%{python3_version} -r s -k"-TestWCSvnCommandPath" testing
 %endif # with_docs
 %{python3_sitelib}/py-*.egg-info/
 %{python3_sitelib}/py/
-%endif # with python3
 
 
 %changelog
-* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 1.8.0-8
+* Wed Feb 16 2022 Tomas Orsava <torsava@redhat.com> - 1.10.0-6
-- Exclude unsupported i686 arch
+- Add gating configuration and a simple smoke test
+- Related: rhbz#1950291
 
-* Tue Nov 19 2019 Lumír Balhar <lbalhar@redhat.com> - 1.8.0-7
+* Tue Feb 08 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 1.10.0-5
-- Adjusted for Python 3.8 module in RHEL 8
+- Add automatically generated Obsoletes tag with the python39- prefix
+  for smoother upgrade from RHEL8
+- Related: rhbz#1990421
+
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.10.0-4
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.10.0-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Dec 26 2020 Thomas Moschny <thomas.moschny@gmx.de> - 1.10.0-1
+- Update to 1.10.0.
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun Jun 28 2020 Thomas Moschny <thomas.moschny@gmx.de> - 1.9.0-1
+- Update to 1.9.0.
+
+* Sat Jun 20 2020 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.2-1
+- Update to 1.8.2.
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.8.0-10
+- Rebuilt for Python 3.9
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1.8.0-9
+- Bootstrap for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Nov 23 2019 Miro Hrončok <mhroncok@redhat.com> - 1.8.0-7
+- Subpackage python2-py has been removed
+  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
 
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.8.0-6
 - Rebuilt for Python 3.8.0rc1 (#1748018)