diff --git a/pytest-3.6.4.tar.gz b/pytest-3.6.4.tar.gz deleted file mode 100644 index fa611a748d02886080b21cac1475523bfaf6e66f..0000000000000000000000000000000000000000 Binary files a/pytest-3.6.4.tar.gz and /dev/null differ diff --git a/pytest-5.1.2.tar.gz b/pytest-5.1.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f16490b3716efb3aefce2e6c9c1e6287f430cdc7 Binary files /dev/null and b/pytest-5.1.2.tar.gz differ diff --git a/pytest.spec b/pytest.spec index eb4b96332a7732a72792914df2b39bb8f7312f4c..091958187a65a1a88ed0ca1c47322c16603870cf 100644 --- a/pytest.spec +++ b/pytest.spec @@ -5,8 +5,8 @@ %global with_help 1 Name: pytest -Version: 3.6.4 -Release: 3 +Version: 5.1.2 +Release: 1 Summary: A mature full-featured Python testing tool License: MIT URL: http://pytest.org @@ -24,29 +24,13 @@ applications and libraries. %description %{_description} -%package -n python2-%{name} -Summary: %{summary} -BuildRequires: python2-atomicwrites python2-attrs python2-devel python2-funcsigs -BuildRequires: python2-hypothesis python2-more-itertools >= 4.0.0 python2-pluggy -BuildRequires: python2-py >= %{pylib_version} python2-setuptools -BuildRequires: python2-setuptools_scm python2-six -Requires: python2-atomicwrites python2-attrs python2-funcsigs -Requires: python2-more-itertools >= 4.0.0 python2-pluggy python2-six -Requires: python2-py >= %{pylib_version} python2-setuptools - -%{?python_provide:%python_provide python2-%{name}} -Provides: %{name} = %{version}-%{release} -Obsoletes: %{name} < 2.8.7-3 - -%description -n python2-%{name} -%{_description} %package -n python3-%{name} Summary: %{summary} BuildRequires: python3-atomicwrites python3-attrs python3-devel python3-hypothesis BuildRequires: python3-more-itertools python3-pluggy python3-py >= %{pylib_version} BuildRequires: python3-setuptools python3-setuptools_scm python3-six -Requires: python3-atomicwrites python3-attrs python3-more-itertools +Requires: python3-atomicwrites python3-attrs python3-more-itertools python3-packaging python3-wcwidth Requires: python3-pluggy python3-py >= %{pylib_version} Requires: python3-setuptools python3-six @@ -65,7 +49,6 @@ Obsoletes: platform-python-%{name} < %{version}-%{release} %autosetup %build -%py2_build %py3_build %if 0%{?with_help} @@ -75,54 +58,28 @@ done %endif %install -%py2_install -for file in pytest py.test; do -mv $RPM_BUILD_ROOT%{_bindir}/${file} $RPM_BUILD_ROOT%{_bindir}/${file}-%{python2_version} -ln -snf ${file}-%{python2_version} $RPM_BUILD_ROOT%{_bindir}/${file}-2 -done - %py3_install -for file in pytest py.test; do -mv $RPM_BUILD_ROOT%{_bindir}/${file} $RPM_BUILD_ROOT%{_bindir}/${file}-%{python3_version} -ln -snf ${file}-%{python3_version} $RPM_BUILD_ROOT%{_bindir}/${file}-3 -done - -for file in pytest py.test; do -ln -snf ${file}-%{python2_version} $RPM_BUILD_ROOT%{_bindir}/${file} -done +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 %if 0%{?with_help} install -d _htmldocs/html %endif -find $RPM_BUILD_ROOT{%{python2_sitelib},%{python3_sitelib}} \ +find %{buildroot}%{python3_sitelib} \ -name '*.py' \ -exec sed -i -e '1{/^#!/d}' {} \; %check %if %{with tests} -PATH=$RPM_BUILD_ROOT%{_bindir}:${PATH} \ -PYTHONPATH=$RPM_BUILD_ROOT%{python2_sitelib} \ - $RPM_BUILD_ROOT%{_bindir}/pytest-%{python2_version} -r s testing \ - --timeout=30 - PATH=$RPM_BUILD_ROOT%{_bindir}:${PATH} \ PYTHONPATH=$RPM_BUILD_ROOT%{python3_sitelib} \ $RPM_BUILD_ROOT%{_bindir}/pytest-%{python3_version} -r s testing \ --timeout=30 %endif -%files -n python2-%{name} -%license LICENSE -%{_bindir}/pytest -%{_bindir}/pytest-2 -%{_bindir}/pytest-%{python2_version} -%{_bindir}/py.test -%{_bindir}/py.test-2 -%{_bindir}/py.test-%{python2_version} -%{python2_sitelib}/pytest-*.egg-info/ -%{python2_sitelib}/_pytest/ -%{python2_sitelib}/pytest.py* %files -n python3-%{name} %license LICENSE @@ -135,12 +92,16 @@ PYTHONPATH=$RPM_BUILD_ROOT%{python3_sitelib} \ %{python3_sitelib}/pytest.py %{python3_sitelib}/__pycache__/pytest.* + %if 0%{?with_help} %files help %doc CHANGELOG.html README.html CONTRIBUTING.html _htmldocs/html %endif %changelog +* Tue Feb 08 2022 huangtianhua - 5.1.2-1 +- Upgrade to 5.1.2 to support OpenStack Train and drop python2 + * Tue Dec 10 2019 mengxian - 3.6.4-2 - Package init