3 changed files with 99 additions and 71 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/python-pluggy-0.6.0.tar.gz
+SOURCES/pluggy-0.13.1.tar.gz
--- a/.python-pluggy.metadata
+++ b/.python-pluggy.metadata
@ -1 +1 @@
-695654f4016d617d1d0ae3f592adc14bc850b734 SOURCES/python-pluggy-0.6.0.tar.gz
+828b2c10996d902b8c47f2fded0e101c636b9ff9 SOURCES/pluggy-0.13.1.tar.gz
--- a/SPECS/python-pluggy.spec
+++ b/SPECS/python-pluggy.spec
@ -1,122 +1,150 @@
-%global pypiname pluggy
+%global pypi_name pluggy

-%bcond_without python3
+# Turn the tests off when bootstrapping Python, because pytest requires pluggy
 %bcond_without tests

 Name:           python-pluggy
-Version:        0.6.0
-Release:        8%{?dist}
+Version:        0.13.1
+Release:        7%{?dist}
 Summary:        The plugin manager stripped of pytest specific details

 License:        MIT
 URL:            https://github.com/pytest-dev/pluggy
-Source0:        https://github.com/pytest-dev/%{pypiname}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:        %{pypi_source}


 BuildArch:      noarch
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-%if %{with tests}
-BuildRequires:  python2-pytest
-%endif
-%if %{with python3}
+
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
+BuildRequires:  python3-setuptools_scm
 %if %{with tests}
 BuildRequires:  python3-pytest
-%endif # with tests
-%endif # with python3
+# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1756902
+%if 0%{?fedora} <= 31
+BuildRequires:  (python3-importlib-metadata if python3 < 3.8)
+%endif
+%endif

 %global _description\
 The plugin manager stripped of pytest specific details.

 %description %_description

-%package -n python2-%{pypiname}
-Summary: %summary
-%{?python_provide:%python_provide python2-%{pypiname}}
+%package -n python3-%{pypi_name}
+Summary:  %summary

-%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}
+%description -n python3-%{pypi_name}
 The plugin manager stripped of pytest specific details.

-%endif # with python3
-

 %prep
-%autosetup -n %{pypiname}-%{version}
+%autosetup -p1 -n %{pypi_name}-%{version}


 %build
-%py2_build
-
-%if %{with python3}
 %py3_build
-%endif # with python3


 %install
-%if %{with python3}
 %py3_install
-%endif # with python3

-%py2_install
-
-
-%check
 %if %{with tests}
-export PYTHONPATH=.:$PYTHONPATH
-py.test-%{python2_version} testing
+%check
+# TODO investigate test_load_setuptools_instantiation failure
+PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest testing -k "not test_load_setuptools_instantiation"
+%endif

-%if %{with python3}
-py.test-%{python3_version} testing
-%endif  # with python3
-%endif  # with tests

-%files -n python2-%{pypiname}
+%files -n python3-%{pypi_name}
+%{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
+* Wed Feb 16 2022 Tomas Orsava <torsava@redhat.com> - 0.13.1-7
+- Add gating configuration and a simple smoke test
+- Related: rhbz#1950291

+* Tue Feb 08 2022 Tomas Orsava <torsava@redhat.com> - 0.13.1-6
+- Add automatically generated Obsoletes tag with the python39- prefix
+  for smoother upgrade from RHEL8
+- Related: rhbz#1990421

-%changelog
-* Mon Dec 11 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0.6.0-8
- Rebuilt for MSVSphere 8.8
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.13.1-5
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.13.1-4
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jun 05 2020 Matthias Runge <mrunge@redhat.com> - 0.13.1-1
+- update to 0.13.1
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 0.13.0-4
+- Rebuilt for Python 3.9
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 0.13.0-3
+- Bootstrap for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Nov 18 2019 Patrik Kopkan <pkopkan@redhat.com> - 0.13.0-1
+- Update to 0.13.0 (#1750961)
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.12.0-5
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 0.12.0-4
+- Rebuilt for Python 3.8
+
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 0.12.0-3
+- Bootstrap for Python 3.8
+
+* 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.

-* Thu Apr 25 2019 Tomas Orsava <torsava@redhat.com> - 0.6.0-8
- Bumping due to problems with modular RPM upgrade path
- Resolves: rhbz#1695587
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

-* Fri Aug 10 2018 Lumír Balhar <lbalhar@redhat.com> - 0.6.0-7
- Use py.test-2.7 instead of py.test
- Resolves: rhbz#1613343
+* Sun Nov 11 2018 Thomas Moschny <thomas.moschny@gmx.de> - 0.8.0-1
+- Update to 0.8.0.

-* Tue Jul 31 2018 Lumír Balhar <lbalhar@redhat.com> - 0.6.0-6
- Switch python3 coditions to bcond
+* 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.

-* Fri Jul 13 2018 Lumír Balhar <lbalhar@redhat.com> - 0.6.0-5
- Python 3 subpackage enabled
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

-* Fri Jul 13 2018 Lumír Balhar <lbalhar@redhat.com> - 0.6.0-4
- Make possible to disable tests to solve circular dependency with pytest
+* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-4
+- Rebuilt for Python 3.7

-* Fri Jul 13 2018 Lumír Balhar <lbalhar@redhat.com> - 0.6.0-3
- First version for python27 module
+* 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