.gitignore

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

.pytest.metadata

@@ -1 +1 @@
-f76ce196096c05575a0a18d02c9adcb85a122b3b SOURCES/pytest-6.2.2.tar.gz
+bc14d7c0f9c0a8299ffdc5a7c0bec1563b4052ac SOURCES/pytest-6.0.2.tar.gz

SPECS/pytest.spec

@@ -1,6 +1,6 @@
 Name:           pytest
-Version:        6.2.2
+Version:        6.0.2
-Release:        6%{?dist}
+Release:        2%{?dist}
 Summary:        Simple powerful testing with Python
 License:        MIT
 URL:            https://pytest.org
@@ -9,8 +9,8 @@ Source0:        %{pypi_source}
 # When building pytest for the first time with new Python version
 # we might not yet have all the BRs, those conditionals allow us to do that.
 
-# Disable tests on RHEL9 as to not pull in the test dependencies
+# This can be used to disable all tests for faster bootstrapping
-# Specify --with tests to run the tests e.g. on EPEL
+# RHEL: Disabled due to missing dependencies
 %bcond_with tests
 
 # Only disabling the optional tests is a more complex but careful approach
@@ -24,73 +24,90 @@ Source0:        %{pypi_source}
 # The bcond is ignored when tests are disabled
 %bcond_without timeout
 
-# Disable documentation on RHEL9 as to not pull in the docs dependencies
+# When building pytest for the first time with new Python version
-# Specify --with docs to generate the documentation e.g. on EPEL
+# we also don't have sphinx yet and cannot build docs.
+# RHEL: Disabled due to missing dependencies
 %bcond_with docs
 
-BuildRequires:  python3-devel
+BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python3-setuptools
+BuildRequires:  python%{python3_pkgversion}-rpm-macros
-BuildRequires:  python3-setuptools_scm
+BuildRequires:  python%{python3_pkgversion}-setuptools
 
 # 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:  python%{python3_pkgversion}-attrs
-BuildRequires:  python3-iniconfig
+BuildRequires:  python%{python3_pkgversion}-iniconfig
-BuildRequires:  python3-packaging
+BuildRequires:  python%{python3_pkgversion}-more-itertools
-BuildRequires:  python3-pluggy >= 0.12
+BuildRequires:  python%{python3_pkgversion}-packaging
-BuildRequires:  python3-py >= 1.5.0
+BuildRequires:  python%{python3_pkgversion}-pluggy >= 0.12
-BuildRequires:  python3-toml
+BuildRequires:  python%{python3_pkgversion}-py >= 1.5.0
+BuildRequires:  python%{python3_pkgversion}-toml
+BuildRequires:  python%{python3_pkgversion}-wcwidth
 
 %if %{with tests}
-BuildRequires:  python3-hypothesis
+BuildRequires:  python%{python3_pkgversion}-hypothesis
-BuildRequires:  python3-xmlschema
+BuildRequires:  python%{python3_pkgversion}-xmlschema
 %if %{with optional_tests}
-BuildRequires:  python3-argcomplete
+BuildRequires:  python%{python3_pkgversion}-argcomplete
-#BuildRequires:  python3-asynctest -- not packaged in Fedora
+BuildRequires:  python%{python3_pkgversion}-asynctest
-BuildRequires:  python3-decorator
+BuildRequires:  python%{python3_pkgversion}-decorator
-BuildRequires:  python3-jinja2
+BuildRequires:  python%{python3_pkgversion}-jinja2
-BuildRequires:  python3-mock
+BuildRequires:  python%{python3_pkgversion}-mock
-BuildRequires:  python3-nose
+BuildRequires:  python%{python3_pkgversion}-nose
-BuildRequires:  python3-numpy
+BuildRequires:  python%{python3_pkgversion}-numpy
-BuildRequires:  python3-pexpect
+BuildRequires:  python%{python3_pkgversion}-pexpect
-BuildRequires:  python3-pytest-xdist
+BuildRequires:  python%{python3_pkgversion}-twisted
-BuildRequires:  python3-twisted
-BuildRequires:  /usr/bin/lsof
 %endif
 %if %{with timeout}
-BuildRequires:  python3-pytest-timeout
+BuildRequires:  python%{python3_pkgversion}-pytest-timeout
 %endif
 %endif
 
 %if %{with docs}
 BuildRequires:  %{_bindir}/rst2html
-BuildRequires:  python3-pygments-pytest
+BuildRequires:  python%{python3_pkgversion}-pygments-pytest
-BuildRequires:  python3-Pallets-Sphinx-Themes
+BuildRequires:  python%{python3_pkgversion}-Pallets-Sphinx-Themes
-BuildRequires:  python3-sphinx
+BuildRequires:  python%{python3_pkgversion}-sphinx
-BuildRequires:  python3-sphinx-removed-in
+BuildRequires:  python%{python3_pkgversion}-sphinx-removed-in
-BuildRequires:  python3-sphinxcontrib-trio
+BuildRequires:  python%{python3_pkgversion}-sphinxcontrib-trio
 BuildRequires:  make
 %endif
 
 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
 
 %description
-The pytest framework makes it easy to write small tests, yet scales to support
+py.test provides simple, yet powerful testing for Python.
-complex functional testing for applications and libraries.
 
 
-%package -n python3-%{name}
+%package -n python%{python3_pkgversion}-%{name}
 Summary:        Simple powerful testing with Python
-Provides:       pytest = %{version}-%{release}
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
+
+Requires: python%{python3_pkgversion}-attrs >= 17.4
+Requires: python%{python3_pkgversion}-iniconfig
+Requires: python%{python3_pkgversion}-more-itertools >= 4
+Requires: python%{python3_pkgversion}-packaging
+Requires: python%{python3_pkgversion}-pluggy >= 0.12
+Requires: python%{python3_pkgversion}-py >= 1.8.2
+Requires: python%{python3_pkgversion}-setuptools
+Requires: python%{python3_pkgversion}-toml
 
-%description -n python3-%{name}
+%description -n python%{python3_pkgversion}-%{name}
-The pytest framework makes it easy to write small tests, yet scales to support
+py.test provides simple, yet powerful testing for Python.
-complex functional testing for applications and libraries.
 
 %prep
 %autosetup -p1 -n %{name}-%{version}
 
+# Remove dependency of setuptools-scm
+sed -i "s/^\s\+setuptools-scm$/version=%{version}/" setup.cfg
+sed -i "s/setup(use_scm_version=.*)/setup()/" setup.py
+
+
 %build
 %py3_build
 
@@ -106,13 +123,7 @@ done
 %install
 %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
-
-# We use 3.X per default
-ln -snf pytest-%{python3_version} %{buildroot}%{_bindir}/pytest
-ln -snf py.test-%{python3_version} %{buildroot}%{_bindir}/py.test
 
 %if %{with docs}
 mkdir -p _htmldocs/html
@@ -130,16 +141,11 @@ find %{buildroot}%{python3_sitelib} \
 
 %if %{with tests}
 %check
-# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1914843
-# upstream: https://github.com/pytest-dev/pytest/issues/8256
-echo "set enable-bracketed-paste off" > .inputrc
-export INPUTRC=$PWD/.inputrc
-
 %global __pytest %{buildroot}%{_bindir}/pytest
-%pytest testing %{?with_timeout:--timeout=30} -rs
+%pytest testing %{?with_timeout:--timeout=30}
 %endif
 
-%files -n python3-%{name}
+%files -n python%{python3_pkgversion}-%{name}
 %if %{with docs}
 %doc CHANGELOG.html
 %doc README.html
@@ -147,47 +153,16 @@ export INPUTRC=$PWD/.inputrc
 %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/
 
 %changelog
-* Tue Feb 22 2022 Tomas Orsava <torsava@redhat.com> - 6.2.2-6
+* Wed Jan 13 2021 Tomas Orsava <torsava@redhat.com> - 6.0.2-2
-- Add gating configuration and a simple smoke test
+- Convert from Fedora to the python39 module in RHEL8
-- Related: rhbz#1950291
+- Resolves: rhbz#1877430
-
-* 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
-
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 6.2.2-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.2.2-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Mar 10 2021 Charalampos Stratakis <cstratak@redhat.com> - 6.2.2-2
-- Disable tests and documentation generation on RHEL9 to avoid pulling in dependencies
-- Drop redundant build dependency on wcwidth (unused since 6.0.0rc1)
-
-* Wed Jan 27 2021 Miro Hrončok <mhroncok@redhat.com> - 6.2.2-1
-- Update to 6.2.2
-- Update the description
-- Fixes: rhbz#1882935
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jan 20 2021 Miro Hrončok <mhroncok@redhat.com> - 6.0.2-2
-- Workaround the bracketed-paste mode breaking tests with Bash 5.1+
 
 * Sat Sep 12 2020 Thomas Moschny <thomas.moschny@gmx.de> - 6.0.2-1
 - Update to 6.0.2.