.gitignore

@@ -1 +1 @@
-SOURCES/pluggy-0.13.0.tar.gz
+SOURCES/python-pluggy-0.6.0.tar.gz

.python-pluggy.metadata

@@ -1 +1 @@
-9d172f2825272e63095ab8e37aae8f1367aad057 SOURCES/pluggy-0.13.0.tar.gz
+695654f4016d617d1d0ae3f592adc14bc850b734 SOURCES/python-pluggy-0.6.0.tar.gz

SPECS/python-pluggy.spec

@@ -1,125 +1,119 @@
-%global pypi_name pluggy
+%global pypiname pluggy
 
-# Turn the tests off when bootstrapping Python, because pytest requires pluggy
+%bcond_without python3
 %bcond_without tests
 
 Name:           python-pluggy
-Version:        0.13.0
+Version:        0.6.0
-Release:        3%{?dist}
+Release:        8%{?dist}
 Summary:        The plugin manager stripped of pytest specific details
 
 License:        MIT
 URL:            https://github.com/pytest-dev/pluggy
-Source0:        %{pypi_source}
+Source0:        https://github.com/pytest-dev/%{pypiname}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 
 BuildArch:      noarch
-# Exclude i686 arch. Due to a modularity issue it's being added to the
+BuildRequires:  python2-devel
-# x86_64 compose of CRB, but we don't want to ship it at all.
+BuildRequires:  python2-setuptools
-# See: https://projects.engineering.redhat.com/browse/RCM-72605
-ExcludeArch:    i686
-
-BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python%{python3_pkgversion}-rpm-macros
-BuildRequires:  python%{python3_pkgversion}-setuptools
 %if %{with tests}
-BuildRequires:  python%{python3_pkgversion}-pytest
+BuildRequires:  python2-pytest
 %endif
+%if %{with python3}
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+%if %{with tests}
+BuildRequires:  python3-pytest
+%endif # with tests
+%endif # with python3
 
 %global _description\
 The plugin manager stripped of pytest specific details.
 
 %description %_description
 
-%package -n python%{python3_pkgversion}-%{pypi_name}
+%package -n python2-%{pypiname}
-Summary:  %summary
+Summary: %summary
+%{?python_provide:%python_provide python2-%{pypiname}}
 
-%description -n python%{python3_pkgversion}-%{pypi_name}
+%description -n python2-%{pypiname} %_description
+
+%if %{with python3}
+%package -n python3-%{pypiname}
+Summary:  The plugin manager stripped of pytest specific details.
+
+%description -n python3-%{pypiname}
 The plugin manager stripped of pytest specific details.
 
+%endif # with python3
+
 
 %prep
-%autosetup -p1 -n %{pypi_name}-%{version}
+%autosetup -n %{pypiname}-%{version}
 
-# Remove dependency of setuptools-scm
-sed -i "/ *use_scm_version=.*,/d" setup.py
-sed -i "s/ *setup_requires=.*/version='%{version}',/" setup.py
 
 %build
+%py2_build
+
+%if %{with python3}
 %py3_build
+%endif # with python3
 
 
 %install
+%if %{with python3}
 %py3_install
+%endif # with python3
+
+%py2_install
+
 
-%if %{with tests}
 %check
-# TODO investigate test_load_setuptools_instantiation failure
+%if %{with tests}
-PYTHONPATH=$PWD %{__python3} -m pytest testing -k "not test_load_setuptools_instantiation"
+export PYTHONPATH=.:$PYTHONPATH
-%endif
+py.test-%{python2_version} testing
 
+%if %{with python3}
+py.test-%{python3_version} testing
+%endif  # with python3
+%endif  # with tests
 
-%files -n python%{python3_pkgversion}-%{pypi_name}
+%files -n python2-%{pypiname}
-%{python3_sitelib}/%{pypi_name}/
-%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/
 %doc README.rst
 %license LICENSE
+%{python2_sitelib}/%{pypiname}
+%{python2_sitelib}/%{pypiname}-%{version}-py%{python2_version}.egg-info
+
+
+%if %{with python3}
+%files -n python3-%{pypiname}
+%{python3_sitelib}/%{pypiname}
+%{python3_sitelib}/%{pypiname}-%{version}-py%{python3_version}.egg-info
+%doc README.rst
+%license LICENSE
+%endif # with python3
 
 
 %changelog
-* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 0.13.0-3
+* Thu Apr 25 2019 Tomas Orsava <torsava@redhat.com> - 0.6.0-8
-- Exclude unsupported i686 arch
+- Bumping due to problems with modular RPM upgrade path
+- Resolves: rhbz#1695587
 
-* Tue Nov 19 2019 Lumír Balhar <lbalhar@redhat.com> - 0.13.0-2
+* Fri Aug 10 2018 Lumír Balhar <lbalhar@redhat.com> - 0.6.0-7
-- Adjusted for Python 3.8 module in RHEL 8
+- Use py.test-2.7 instead of py.test
+- Resolves: rhbz#1613343
 
-* Mon Nov 18 2019 Patrik Kopkan <pkopkan@redhat.com> - 0.13.0-1
+* Tue Jul 31 2018 Lumír Balhar <lbalhar@redhat.com> - 0.6.0-6
-- Update to 0.13.0 (#1750961)
+- Switch python3 coditions to bcond
 
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.12.0-5
+* Fri Jul 13 2018 Lumír Balhar <lbalhar@redhat.com> - 0.6.0-5
-- Rebuilt for Python 3.8.0rc1 (#1748018)
+- Python 3 subpackage enabled
 
-* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 0.12.0-4
+* Fri Jul 13 2018 Lumír Balhar <lbalhar@redhat.com> - 0.6.0-4
-- Rebuilt for Python 3.8
+- Make possible to disable tests to solve circular dependency with pytest
 
-* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 0.12.0-3
+* Fri Jul 13 2018 Lumír Balhar <lbalhar@redhat.com> - 0.6.0-3
-- Bootstrap for Python 3.8
+- First version for python27 module
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Jun 26 2019 Miro Hrončok <mhroncok@redhat.com> - 0.12.0-1
-- Update to 0.12.0 (#1714369)
-- Move python2-pluggy to a separate package
-
-* Tue May 14 2019 Thomas Moschny <thomas.moschny@gmx.de> - 0.11.0-1
-- Update to 0.11.0.
-
-* Tue Mar 12 2019 Miro Hrončok <mhroncok@redhat.com> - 0.9.0-1
-- Update to 0.9.0 (#1680414)
-
-* Fri Feb 08 2019 Alfredo Moralejo <amoralej@redhat.com> - 0.8.1-1
-- Update to 0.8.1.
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sun Nov 11 2018 Thomas Moschny <thomas.moschny@gmx.de> - 0.8.0-1
-- Update to 0.8.0.
-
-* Sat Oct  6 2018 Thomas Moschny <thomas.moschny@gmx.de> - 0.7.1-1
-- Update to 0.7.1.
-- Update BRs.
-- Use source URL to released archive containing pluggy/_version.py.
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-4
-- Rebuilt for Python 3.7
-
-* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-3
-- Bootstrap for Python 3.7
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild