.gitignore

@@ -1 +1 @@
-SOURCES/pytest-3.4.2.tar.gz
+SOURCES/pytest-6.2.2.tar.gz

.pytest.metadata

@@ -1 +1 @@
-1194854795c65e29a1038da50fe5f5230f964360 SOURCES/pytest-3.4.2.tar.gz
+f76ce196096c05575a0a18d02c9adcb85a122b3b SOURCES/pytest-6.2.2.tar.gz

SPECS/pytest.spec

@@ -1,208 +1,331 @@
-%bcond_without python3
-
-%global pylib_version 1.4.29
-
 Name:           pytest
-Version:        3.4.2
+Version:        6.2.2
-Release:        13%{?dist}
+Release:        6%{?dist}
 Summary:        Simple powerful testing with Python
 License:        MIT
-URL:            http://pytest.org
+URL:            https://pytest.org
-Source0:        https://files.pythonhosted.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+Source0:        %{pypi_source}
 
-# The tests in this specfile use pytest-timeout
 # When building pytest for the first time with new Python version
-# that is not possible as it depends on pytest.
+# we might not yet have all the BRs, those conditionals allow us to do that.
-# It's also not possible on systems that don't build pytest-timeout at all.
-%bcond_with timeout
 
-BuildArch:      noarch
+# Disable tests on RHEL9 as to not pull in the test dependencies
+# Specify --with tests to run the tests e.g. on EPEL
+%bcond_with tests
 
-%description
+# Only disabling the optional tests is a more complex but careful approach
-py.test provides simple, yet powerful testing for Python.
+# Pytest will skip the related tests, so we only conditionalize the BRs
+# This bcond is ignored when tests are disabled
+%bcond_without optional_tests
+
+# To run the tests in %%check we use pytest-timeout
+# When building pytest for the first time with new Python version
+# that is not possible as it depends on pytest
+# The bcond is ignored when tests are disabled
+%bcond_without timeout
+
+# Disable documentation on RHEL9 as to not pull in the docs dependencies
+# Specify --with docs to generate the documentation e.g. on EPEL
+%bcond_with docs
 
-%package -n python2-%{name}
-Summary:        Simple powerful testing with Python
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-BuildRequires:  python2-setuptools_scm
-BuildRequires:  python2-py >= %{pylib_version}
-BuildRequires:  python2-attrs
-%if %{with timeout}
-BuildRequires:  python2-pytest-timeout
-%endif
-BuildRequires:  python2-pluggy
-BuildRequires:  python2-funcsigs
-BuildRequires:  python2-six
-Requires:       python2-attrs
-Requires:       python2-funcsigs
-Requires:       python2-pluggy
-Requires:       python2-six
-Requires:       python2-setuptools
-Requires:       python2-py >= %{pylib_version}
-%{?python_provide:%python_provide python2-%{name}}
-Obsoletes:      %{name} < 2.8.7-3
-
-%description -n python2-%{name}
-py.test provides simple, yet powerful testing for Python.
-
-%if %{with python3}
-%package -n python3-%{name}
-Summary:        Simple powerful testing with Python
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-setuptools_scm
-BuildRequires:  python3-py >= %{pylib_version}
+
-BuildRequires:  python3-hypothesis
+# Those are also runtime deps, needed for tests and docs
+# We keep them unconditionality, so we don't accidentally build pytest
+# before them and get broken dependencies
 BuildRequires:  python3-attrs
+BuildRequires:  python3-iniconfig
+BuildRequires:  python3-packaging
+BuildRequires:  python3-pluggy >= 0.12
+BuildRequires:  python3-py >= 1.5.0
+BuildRequires:  python3-toml
+
+%if %{with tests}
+BuildRequires:  python3-hypothesis
+BuildRequires:  python3-xmlschema
+%if %{with optional_tests}
+BuildRequires:  python3-argcomplete
+#BuildRequires:  python3-asynctest -- not packaged in Fedora
+BuildRequires:  python3-decorator
+BuildRequires:  python3-jinja2
+BuildRequires:  python3-mock
+BuildRequires:  python3-nose
+BuildRequires:  python3-numpy
+BuildRequires:  python3-pexpect
+BuildRequires:  python3-pytest-xdist
+BuildRequires:  python3-twisted
+BuildRequires:  /usr/bin/lsof
+%endif
 %if %{with timeout}
 BuildRequires:  python3-pytest-timeout
 %endif
-BuildRequires:  python3-pluggy
+%endif
-BuildRequires:  python3-six
-Requires:       python3-attrs
-Requires:       python3-pluggy
-Requires:       python3-six
-Requires:       python3-setuptools
-Requires:       python3-py >= %{pylib_version}
-%{?python_provide:%python_provide python3-%{name}}
-Obsoletes:      platform-python-%{name} < %{version}-%{release}
-
-%description -n python3-%{name}
-py.test provides simple, yet powerful testing for Python.
 
+%if %{with docs}
+BuildRequires:  %{_bindir}/rst2html
+BuildRequires:  python3-pygments-pytest
+BuildRequires:  python3-Pallets-Sphinx-Themes
+BuildRequires:  python3-sphinx
+BuildRequires:  python3-sphinx-removed-in
+BuildRequires:  python3-sphinxcontrib-trio
+BuildRequires:  make
 %endif
 
+BuildArch:      noarch
+
+%description
+The pytest framework makes it easy to write small tests, yet scales to support
+complex functional testing for applications and libraries.
+
+
+%package -n python3-%{name}
+Summary:        Simple powerful testing with Python
+Provides:       pytest = %{version}-%{release}
+
+%description -n python3-%{name}
+The pytest framework makes it easy to write small tests, yet scales to support
+complex functional testing for applications and libraries.
+
 %prep
-%autosetup
+%autosetup -p1 -n %{name}-%{version}
 
 %build
-%py2_build
-%if %{with python3}
 %py3_build
+
+%if %{with docs}
+for l in doc/* ; do
+  make -C $l html PYTHONPATH=$(pwd)/src SPHINXBUILD=%{_bindir}/sphinx-build-3
+done
+for f in README CHANGELOG CONTRIBUTING ; do
+  rst2html ${f}.rst > ${f}.html
+done
 %endif
 
 %install
-%py2_install
-mv %{buildroot}%{_bindir}/pytest %{buildroot}%{_bindir}/pytest-%{python2_version}
-ln -snf pytest-%{python2_version} %{buildroot}%{_bindir}/pytest-2
-mv %{buildroot}%{_bindir}/py.test %{buildroot}%{_bindir}/py.test-%{python2_version}
-ln -snf py.test-%{python2_version} %{buildroot}%{_bindir}/py.test-2
-%if %{with python3}
 %py3_install
 mv %{buildroot}%{_bindir}/pytest %{buildroot}%{_bindir}/pytest-%{python3_version}
 ln -snf pytest-%{python3_version} %{buildroot}%{_bindir}/pytest-3
 mv %{buildroot}%{_bindir}/py.test %{buildroot}%{_bindir}/py.test-%{python3_version}
 ln -snf py.test-%{python3_version} %{buildroot}%{_bindir}/py.test-3
-%endif
 
-# remove shebangs from all scripts - python 2
+# We use 3.X per default
-find %{buildroot}%{python2_sitelib} \
+ln -snf pytest-%{python3_version} %{buildroot}%{_bindir}/pytest
-     -name '*.py' \
+ln -snf py.test-%{python3_version} %{buildroot}%{_bindir}/py.test
-     -exec sed -i -e '1{/^#!/d}' {} \;
+
+%if %{with docs}
+mkdir -p _htmldocs/html
+for l in doc/* ; do
+  # remove hidden file
+  rm ${l}/_build/html/.buildinfo
+  mv ${l}/_build/html _htmldocs/html/${l##doc/}
+done
+%endif
 
-%if %{with python3}
+# remove shebangs from all scripts
-# remove shebangs from all scripts - python 3
 find %{buildroot}%{python3_sitelib} \
      -name '*.py' \
      -exec sed -i -e '1{/^#!/d}' {} \;
-%endif
 
+%if %{with tests}
 %check
-PATH=%{buildroot}%{_bindir}:${PATH} \
+# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1914843
-# Skip "metafunc" tests, since these require pythyon2-hypothesis
+# upstream: https://github.com/pytest-dev/pytest/issues/8256
-PYTHONPATH=%{buildroot}%{python2_sitelib} \
+echo "set enable-bracketed-paste off" > .inputrc
-  %{buildroot}%{_bindir}/pytest-%{python2_version} -r s testing \
+export INPUTRC=$PWD/.inputrc
-  -k 'not non_ascii_paste_text' \
+
-  --ignore 'testing/python/metafunc.py' \
+%global __pytest %{buildroot}%{_bindir}/pytest
-  %if %{with timeout}
+%pytest testing %{?with_timeout:--timeout=30} -rs
-  --timeout=30
-  %endif
-
-%if %{with python3}
-PATH=%{buildroot}%{_bindir}:${PATH} \
-PYTHONPATH=%{buildroot}%{python3_sitelib} \
-  %{buildroot}%{_bindir}/pytest-%{python3_version} -r s testing \
-  -k 'not non_ascii_paste_text' \
-  %if %{with timeout}
-  --timeout=30
-  %endif
 %endif
 
-%files -n python2-%{name}
-%doc CHANGELOG.rst
-%doc README.rst
-%doc CONTRIBUTING.rst
-%license LICENSE
-%{_bindir}/pytest-2
-%{_bindir}/pytest-%{python2_version}
-%{_bindir}/py.test-2
-%{_bindir}/py.test-%{python2_version}
-%{python2_sitelib}/pytest-*.egg-info/
-%{python2_sitelib}/_pytest/
-%{python2_sitelib}/pytest.py*
-
-%if %{with python3}
 %files -n python3-%{name}
-%doc CHANGELOG.rst
+%if %{with docs}
-%doc README.rst
+%doc CHANGELOG.html
-%doc CONTRIBUTING.rst
+%doc README.html
+%doc CONTRIBUTING.html
+%doc _htmldocs/html
+%endif
 %license LICENSE
+%{_bindir}/pytest
 %{_bindir}/pytest-3
 %{_bindir}/pytest-%{python3_version}
+%{_bindir}/py.test
 %{_bindir}/py.test-3
 %{_bindir}/py.test-%{python3_version}
 %{python3_sitelib}/pytest-*.egg-info/
 %{python3_sitelib}/_pytest/
-%{python3_sitelib}/pytest.py
+%{python3_sitelib}/pytest/
-%{python3_sitelib}/__pycache__/pytest.*
-%endif
 
 %changelog
-* Mon Dec 11 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 3.4.2-13
+* Tue Feb 22 2022 Tomas Orsava <torsava@redhat.com> - 6.2.2-6
-- Rebuilt for MSVSphere 8.8
+- Add gating configuration and a simple smoke test
+- Related: rhbz#1950291
+
+* Tue Feb 08 2022 Tomas Orsava <torsava@redhat.com> - 6.2.2-5
+- Add automatically generated Obsoletes tag with the python39- prefix
+  for smoother upgrade from RHEL8
+- Related: rhbz#1990421
 
-* Thu Apr 25 2019 Tomas Orsava <torsava@redhat.com> - 3.4.2-13
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 6.2.2-4
-- Bumping due to problems with modular RPM upgrade path
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-- Resolves: rhbz#1695587
+  Related: rhbz#1991688
 
-* Tue Oct 09 2018 Lumír Balhar <lbalhar@redhat.com> - 3.4.2-12
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.2.2-3
-- Remove unversioned provides
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-- Resolves: rhbz#1628242
 
-* Wed Aug 08 2018 Lumír Balhar <lbalhar@redhat.com> - 3.4.2-11
+* Wed Mar 10 2021 Charalampos Stratakis <cstratak@redhat.com> - 6.2.2-2
-- Remove unversioned binaries from python2 subpackage
+- Disable tests and documentation generation on RHEL9 to avoid pulling in dependencies
-- Resolves: rhbz#1613343
+- Drop redundant build dependency on wcwidth (unused since 6.0.0rc1)
 
-* Tue Jul 31 2018 Lumír Balhar <lbalhar@redhat.com> - 3.4.2-10
+* Wed Jan 27 2021 Miro Hrončok <mhroncok@redhat.com> - 6.2.2-1
-- Make possible to disable python3 subpackage
+- Update to 6.2.2
+- Update the description
+- Fixes: rhbz#1882935
 
-* Fri Jul 13 2018 Lumír Balhar <lbalhar@redhat.com> - 3.4.2-9
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.2-3
-- First version for python27 module
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
-* Mon Jun 25 2018 Petr Viktorin <pviktori@redhat.com> - 3.4.2-8
+* Wed Jan 20 2021 Miro Hrončok <mhroncok@redhat.com> - 6.0.2-2
-- Allow Python 2 for build
+- Workaround the bracketed-paste mode breaking tests with Bash 5.1+
-  see https://hurl.corp.redhat.com/rhel8-py2
 
-* Fri Jun 22 2018 Petr Viktorin <pviktori@redhat.com> - 3.4.2-7
+* Sat Sep 12 2020 Thomas Moschny <thomas.moschny@gmx.de> - 6.0.2-1
-- Remove BuildRequires on python2-hypothesis, a circular dependency
+- Update to 6.0.2.
-- Explicitly BuildRequire python-attrs
 
-* Tue Jun 19 2018 Petr Viktorin <pviktori@redhat.com> - 3.4.2-6
+* Thu Aug 06 2020 Miro Hrončok <mhroncok@redhat.com> - 6.0.1-1
-- Don't use timeout in tests
+- Update to 6.0.1 (#1862097)
-  https://bugzilla.redhat.com/show_bug.cgi?id=1592940
-- Add missing BuildRequires
 
-* Thu Jun 07 2018 Petr Viktorin <pviktori@redhat.com> - 3.4.2-5
+* Tue Jul 28 2020 Miro Hrončok <mhroncok@redhat.com> - 6.0.0~rc1-1
-- Remove optional BuildRequires for %%check
+- Update to 6.0.0rc1
-  https://bugzilla.redhat.com/show_bug.cgi?id=1588445
 
-* Mon May 28 2018 Petr Viktorin <pviktori@redhat.com> - 3.4.2-4
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.3-2
-- Drop python2-argcomplete from BuildRequires
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Mon May 28 2018 Petr Viktorin <pviktori@redhat.com> - 3.4.2-3
+* Fri Jun  5 2020 Thomas Moschny <thomas.moschny@gmx.de> - 5.4.3-1
-- Use python3-sphinx to build the documentation
+- Update to 5.4.3.
-- Skip the `non_ascii_paste_text` test, which needs internet access
+
+* Fri May 29 2020 Miro Hrončok <mhroncok@redhat.com> - 5.4.2-1
+- Update to 5.4.2 (#1707986)
+
+* Sun May 24 2020 Miro Hrončok <mhroncok@redhat.com> - 4.6.10-3
+- Rebuilt for Python 3.9
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 4.6.10-2
+- Bootstrap for Python 3.9
+
+* Fri May 08 2020 Miro Hrončok <mhroncok@redhat.com> - 4.6.10-1
+- Update to 4.6.10.
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Jan  5 2020 Thomas Moschny <thomas.moschny@gmx.de> - 4.6.9-1
+- Update to 4.6.9.
+
+* Fri Jan  3 2020 Thomas Moschny <thomas.moschny@gmx.de> - 4.6.8-1
+- Update to 4.6.8.
+
+* Fri Dec 06 2019 Miro Hrončok <mhroncok@redhat.com> - 4.6.7-1
+- Update to 4.6.7
+
+* Fri Oct 25 2019 Thomas Moschny <thomas.moschny@gmx.de> - 4.6.6-1
+- Update to 4.6.6.
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 4.6.5-4
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Sat Aug 17 2019 Miro Hrončok <mhroncok@redhat.com> - 4.6.5-3
+- Rebuilt for Python 3.8
+
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 4.6.5-2
+- Bootstrap for Python 3.8
+
+* Wed Aug 14 2019 Thomas Moschny <thomas.moschny@gmx.de> - 4.6.5-1
+- Update to 4.6.5.
+- Add missing BR on make.
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jul 23 2019 Miro Hrončok <mhroncok@redhat.com> - 4.6.4-2
+- Fix a bad conflict
+
+* Mon Jul 01 2019 Miro Hrončok <mhroncok@redhat.com> - 4.6.4-1
+- Update to 4.6.4, move python2-pytest to its own source package
+- Make /usr/bin/pytest and /usr/bin/py.test Python 3
+
+* Fri Jun 21 2019 Petr Viktorin <pviktori@redhat.com> - 4.4.1-2
+- Remove optional test dependencies for Python 2 entirely
+
+* Tue Apr 16 2019 Thomas Moschny <thomas.moschny@gmx.de> - 4.4.1-1
+- Update to 4.4.1 (see PR#9).
+- Remove test dependencies on python2-hypothesis and python2-twisted (see PR#10).
+
+* Sat Mar 16 2019 Miro Hrončok <mhroncok@redhat.com> - 4.3.1-1
+- Update to 4.3.1
+
+* Tue Mar 12 2019 Miro Hrončok <mhroncok@redhat.com> - 4.3.0-1
+- Update to 4.3.0 and fix FTBFS (#1671167, #1687384)
+
+* Mon Feb 18 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.9.3-3
+- Enable python dependency generator
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Oct 31 2018 Thomas Moschny <thomas.moschny@gmx.de> - 3.9.3-1
+- Update to 3.9.3.
+
+* Tue Oct 23 2018 Thomas Moschny <thomas.moschny@gmx.de> - 3.9.2-1
+- Update to 3.9.2.
+
+* Wed Oct 17 2018 Thomas Moschny <thomas.moschny@gmx.de> - 3.9.1-1
+- Update to 3.9.1.
+
+* Tue Oct 16 2018 Thomas Moschny <thomas.moschny@gmx.de> - 3.8.2-3
+- Add python2-pathlib2 runtime requirement (rhbz#1639718).
+
+* Tue Oct 16 2018 Nils Philippsen <nils@redhat.com> - 3.8.2-2
+- versionize pluggy dependencies
+
+* Tue Oct 16 2018 Thomas Moschny <thomas.moschny@gmx.de> - 3.8.2-1
+- Update to 3.8.2.
+
+* Sat Sep 29 2018 Thomas Moschny <thomas.moschny@gmx.de> - 3.6.4-1
+- Update to 3.6.4.
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jul  5 2018 Thomas Moschny <thomas.moschny@gmx.de> - 3.6.3-1
+- Update to 3.6.3.
+
+* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 3.6.2-3
+- Enable timeout
+
+* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 3.6.2-2
+- Rebuilt for Python 3.7 (without timeout)
+
+* Thu Jun 28 2018 Thomas Moschny <thomas.moschny@gmx.de> - 3.6.2-1
+- Update to 3.6.2.
+
+* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 3.6.1-3
+- Rebuilt for Python 3.7
+
+* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 3.6.1-2
+- Bootstrap for Python 3.7
+
+* Tue Jun  5 2018 Thomas Moschny <thomas.moschny@gmx.de> - 3.6.1-1
+- Update to 3.6.1.
+
+* Mon May 28 2018 Miro Hrončok <mhroncok@redhat.com> - 3.6.0-1
+- Update to 3.6.0 (#1581692)
+- Require and BuildRequire atomicwrites
+
+* Sat May 19 2018 Thomas Moschny <thomas.moschny@gmx.de> - 3.5.1-1
+- Update to 3.5.1.
+- Build the documentation with Python3.
+- Update requirements.
 
 * Thu Mar 15 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.4.2-2
 - Add Requires for required modules