diff --git a/.gitignore b/.gitignore index 3b9efdb..acf68bb 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /requests-mock-1.5.1.tar.gz /requests-mock-1.5.2.tar.gz /requests-mock-1.7.0.tar.gz +/requests-mock-1.8.0.tar.gz diff --git a/python-requests-mock.spec b/python-requests-mock.spec index 7679fe0..8566a3d 100644 --- a/python-requests-mock.spec +++ b/python-requests-mock.spec @@ -1,13 +1,3 @@ -%if 0%{?fedora} || 0%{?rhel} > 7 -# Enable python3 build by default -%bcond_without python3 -# Disable python2 build by default -%bcond_with python2 -%else -%bcond_with python3 -%bcond_without python2 -%endif - %if 0%{?rhel} >= 8 # Disable tests on epel8 - dependencies dont exist. %bcond_with tests @@ -16,8 +6,8 @@ %endif Name: python-requests-mock -Version: 1.7.0 -Release: 4%{?dist} +Version: 1.8.0 +Release: 1%{?dist} Summary: A requests mocking tool for python License: ASL 2.0 @@ -33,47 +23,7 @@ BuildArch: noarch requests-mock provides a simple way to do HTTP mocking at the python-requests layer. -%if %{with python2} -%package -n python2-requests-mock -Summary: A requests mocking tool for python - -Requires: python2-requests -Requires: python2-six - -# This {?fedora:2} syntax is because it's python2- on f28+ but just python- on -# epel still. Hopefully this can be removed when epel is fixed. -BuildRequires: python%{?fedora:2}-urllib3 - -# standard requirements needed for testing -BuildRequires: python2-requests -BuildRequires: python2-six - -BuildRequires: python2-devel -BuildRequires: python2-pbr -BuildRequires: python2-setuptools - -%if 0%{?rhel} && 0%{?rhel} <= 6 -BuildRequires: python-discover -%endif - -%if %{with tests} -BuildRequires: python2-mock -BuildRequires: python2-pytest -BuildRequires: python%{?fedora:2}-fixtures -BuildRequires: python%{?fedora:2}-testtools -%endif - -%{?python_provide:%python_provide python2-requests-mock} - - -%description -n python2-requests-mock -requests-mock provides a simple way to do HTTP mocking at the -python-requests layer. -%endif - - -%if %{with python3} %package -n python%{python3_pkgversion}-requests-mock Summary: A requests mocking tool for python @@ -102,7 +52,6 @@ BuildRequires: python%{python3_pkgversion}-pytest %description -n python%{python3_pkgversion}-requests-mock requests-mock provides a simple way to do HTTP mocking at the python-requests layer. -%endif %prep @@ -115,58 +64,32 @@ rm -rf requests_mock.egg-info %build -%if %{with python2} -%py2_build -%endif - -%if %{with python3} %py3_build -%endif %install -%if %{with python2} -%py2_install -%endif - -%if %{with python3} %py3_install -%endif %check %if %{with tests} -%if %{with python2} -%{__python2} -m testtools.run discover -%{__python2} -m pytest tests/pytest -%endif - -%if %{with python3} %{__python3} -m testtools.run discover %{__python3} -m pytest tests/pytest %endif -%endif -%if %{with python2} -%files -n python2-requests-mock -%license LICENSE -%doc README.rst ChangeLog -%{python2_sitelib}/requests_mock -%{python2_sitelib}/requests_mock-%{version}-py%{python2_version}.egg-info -%endif - - -%if %{with python3} %files -n python%{python3_pkgversion}-requests-mock %license LICENSE %doc README.rst ChangeLog %{python3_sitelib}/requests_mock %{python3_sitelib}/requests_mock-%{version}-py%{python3_version}.egg-info -%endif %changelog +* Tue Sep 15 2020 Joel Capitao - 1.8.0-1 +- Update to 1.8.0 +- Remove Python 2 subpackage + * Wed Jul 29 2020 Fedora Release Engineering - 1.7.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index b2ae25e..dc43f2a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-mock-1.7.0.tar.gz) = 6ad71fb87519f93812e8ae0d058a4b65a4492e86f05cacc37f95be1a6f0239a2c3f3d20a7e6f44bcc21f009574e4e78c2149394c2570d305efbdd68ec07b24a2 +SHA512 (requests-mock-1.8.0.tar.gz) = 252bce965e0fca03cd5ce09912c726045f9c632e90bfee13b06c9f3e2c6b70eab7f39cf8e7efb3b7d2cf2b5d79cc5c5ba6e2379b3d48ce33bf78861ada911918