From 0375ed34586d0482c038498beb91b6057a0b6e38 Mon Sep 17 00:00:00 2001 From: rdobuilder Date: Dec 19 2022 08:52:01 +0000 Subject: Update to 1.10.0 Related-to: https://review.rdoproject.org/r/q/Iaa237adba5fb5e11d8e4eae47da7daf0842f1436 --- diff --git a/.python-requests-mock.metadata b/.python-requests-mock.metadata new file mode 100644 index 0000000..ff52287 --- /dev/null +++ b/.python-requests-mock.metadata @@ -0,0 +1 @@ +84a326923b45dc882ac4c1f120ceb2bd00ac31f5 SOURCES/requests-mock-1.10.0.tar.gz diff --git a/SOURCES/0002-Use-system-urllib3-package.patch b/SOURCES/0002-Use-system-urllib3-package.patch new file mode 100644 index 0000000..90694e9 --- /dev/null +++ b/SOURCES/0002-Use-system-urllib3-package.patch @@ -0,0 +1,29 @@ +From e1f48323a1eb73018e3929eeac65b26eee7207ea Mon Sep 17 00:00:00 2001 +From: Jamie Lennox +Date: Wed, 4 Dec 2019 21:56:45 +1100 +Subject: [PATCH] Use system urllib3 package + +The fedora requests package uses the system urllib3 rather than the one +bundled into requests. requests-mock must therefore do the same thing. +--- + requests_mock/response.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/requests_mock/response.py b/requests_mock/response.py +index d081cf5..13ab2b8 100644 +--- a/requests_mock/response.py ++++ b/requests_mock/response.py +@@ -16,9 +16,9 @@ from requests.adapters import HTTPAdapter + from requests.cookies import MockRequest, MockResponse + from requests.cookies import RequestsCookieJar + from requests.cookies import merge_cookies, cookiejar_from_dict +-from requests.packages.urllib3.response import HTTPResponse + from requests.utils import get_encoding_from_headers + import six ++from urllib3.response import HTTPResponse + + from requests_mock import compat + from requests_mock import exceptions +-- +2.21.0 + diff --git a/SOURCES/0003-Allow-skipping-purl-tests-if-it-is-not-present.patch b/SOURCES/0003-Allow-skipping-purl-tests-if-it-is-not-present.patch new file mode 100644 index 0000000..a001e7b --- /dev/null +++ b/SOURCES/0003-Allow-skipping-purl-tests-if-it-is-not-present.patch @@ -0,0 +1,41 @@ +From b1844f12934f7a1554fdfaf26cb05261d222a1da Mon Sep 17 00:00:00 2001 +From: Jamie Lennox +Date: Wed, 4 Dec 2019 22:16:16 +1100 +Subject: [PATCH] Allow skipping purl tests if it is not present + +Purl is not available in some packaging scenarios, like on fedora. +Easiest to just ignore this one if not present. +--- + tests/test_adapter.py | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/tests/test_adapter.py b/tests/test_adapter.py +index 70d0752..b6aa845 100644 +--- a/tests/test_adapter.py ++++ b/tests/test_adapter.py +@@ -13,7 +13,11 @@ + import json + import re + +-import purl ++try: ++ import purl ++except ImportError: ++ purl = None ++ + import requests + import six + from six.moves.urllib import parse as urlparse +@@ -329,6 +333,9 @@ class SessionAdapterTests(base.TestCase): + self.assertEqual('resp', resp.text) + + def test_with_purl(self): ++ if purl is None: ++ self.skipTest('purl is not present') ++ + self.adapter.register_uri('GET', + purl.URL('mock://www.tester.com/a'), + text='resp') +-- +2.21.0 + diff --git a/SPECS/python-requests-mock.spec b/SPECS/python-requests-mock.spec new file mode 100644 index 0000000..e89bc6b --- /dev/null +++ b/SPECS/python-requests-mock.spec @@ -0,0 +1,228 @@ +%if 0%{?rhel} >= 8 +# Disable tests on epel8 - dependencies dont exist. +%bcond_with tests +%else +%bcond_without tests +%endif + +Name: python-requests-mock +Version: 1.10.0 +Release: 1%{?dist} +Summary: A requests mocking tool for python + +License: ASL 2.0 +URL: https://requests-mock.readthedocs.io/ +Source0: https://pypi.io/packages/source/r/requests-mock/requests-mock-%{version}.tar.gz + +Patch0: 0002-Use-system-urllib3-package.patch +Patch1: 0003-Allow-skipping-purl-tests-if-it-is-not-present.patch + +BuildArch: noarch + +%description +requests-mock provides a simple way to do HTTP mocking at the +python-requests layer. + + +%package -n python%{python3_pkgversion}-requests-mock +Summary: A requests mocking tool for python + +Requires: python%{python3_pkgversion}-requests +Requires: python%{python3_pkgversion}-six + +# standard requirements needed for testing +BuildRequires: python%{python3_pkgversion}-requests +BuildRequires: python%{python3_pkgversion}-six +BuildRequires: python%{python3_pkgversion}-urllib3 + +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-pbr +BuildRequires: python%{python3_pkgversion}-setuptools + +%{?python_provide:%python_provide python3-requests-mock} + +%if %{with tests} +BuildRequires: python%{python3_pkgversion}-fixtures +BuildRequires: python%{python3_pkgversion}-mock +BuildRequires: python%{python3_pkgversion}-testtools +BuildRequires: python%{python3_pkgversion}-pytest +BuildRequires: python-requests-futures +%endif + + +%description -n python%{python3_pkgversion}-requests-mock +requests-mock provides a simple way to do HTTP mocking at the +python-requests layer. + + +%prep +%setup -q -n requests-mock-%{version} +%patch0 -p1 +%patch1 -p1 + +# Remove bundled egg-info +rm -rf requests_mock.egg-info + + +%build +%py3_build + + +%install +%py3_install + + +%check +%if %{with tests} +%{__python3} -m testtools.run discover +%{__python3} -m pytest tests/pytest +%endif + + +%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 + + +%changelog +* Thu Dec 15 2022 Joel Capitao - 1.10.0-1 +- Update to 1.10.0 + +* Fri Jul 22 2022 Fedora Release Engineering - 1.9.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jun 15 2022 Python Maint - 1.9.3-2 +- Rebuilt for Python 3.11 + +* Wed Feb 23 2022 Karolina Kula - 1.9.3-1 +- Update to 1.9.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 1.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 1.8.0-3 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* 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 + +* Tue May 26 2020 Miro Hrončok - 1.7.0-3 +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 1.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Dec 03 2019 Jamie Lennox - 1.7.0-1 +- Updated to upstream 1.7.0 +- Conditionalized tests for EPEL8 not having required dependencies +- Add patch to skip purl tests as dependency not present. + +* Thu Oct 03 2019 Miro Hrončok - 1.5.2-6 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 1.5.2-5 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 1.5.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Feb 27 2019 Yatin Karel - 1.5.2-3 +- Disable python2 build in Fedora and EL > 7 + +* Sat Feb 02 2019 Fedora Release Engineering - 1.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 21 2018 Jamie Lennox - 1.5.2-1 +- Update to upstream 1.5.2. +- Fix bug introduced in 1.5.1 + +* Sat Jul 21 2018 Jamie Lennox - 1.5.1-1 +- Update to upstream 1.5.1. +- Fixes py.test plugin with py.test<3 as in EPEL. + +* Sat Jul 14 2018 Fedora Release Engineering - 1.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jul 02 2018 Miro Hrončok - 1.5.0-2 +- Rebuilt for Python 3.7 + +* Sat Jun 23 2018 Jamie Lennox - 1.5.0-1 +- Update to upstream 1.5.0. + +* Fri Jun 22 2018 Carl George - 1.3.0-6 +- EPEL compatibility + +* Tue Jun 19 2018 Miro Hrončok - 1.3.0-5 +- Rebuilt for Python 3.7 + +* Wed Feb 28 2018 Iryna Shcherbina - 1.3.0-4 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Fri Feb 09 2018 Fedora Release Engineering - 1.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Dec 17 2017 Zbigniew Jędrzejewski-Szmek - 1.3.0-2 +- Fix creation of python2- subpackage + +* Fri Nov 17 2017 Alfredo Moralejo - 1.3.0-1 +- Update to upstream 1.3.0. Required for OpenStack packages. + +* Thu Jul 27 2017 Fedora Release Engineering - 1.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Dec 22 2016 Jamie Lennox - 1.2.0-1 +- Upstream 1.2.0. Fixes testing bug preventing package rebuilding. + +* Mon Dec 19 2016 Miro Hrončok - 1.1.0-2 +- Rebuild for Python 3.6 + +* Mon Nov 14 2016 Haïkel Guémar - 1.1.0-1 +- Upstream 1.1.0 + +* Tue Jul 19 2016 Fedora Release Engineering - 1.0.0-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Mon Jun 27 2016 Haïkel Guémar - 1.0.0-1 +- Upstream 1.0.0 (RHBZ#1334354) +- Use pypi.io for SourceURL +- Fix unversioned python macros + +* Thu Feb 04 2016 Fedora Release Engineering - 0.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Dec 4 2015 Jamie Lennox - 0.7.0-1 +- Update package to new version. +- Add python2 subpackage for new python packaging guidelines. +- Redo patch1 to still apply. + +* Tue Nov 10 2015 Fedora Release Engineering - 0.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Thu Jun 18 2015 Fedora Release Engineering - 0.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Feb 6 2015 Jamie Lennox - 0.6.0-1 +- Update package to new version + +* Tue Sep 2 2014 Jamie Lennox - 0.5.1-2 +- Removed packaged egg-info to force rebuild. +- Removed unneeded CFLAGS from build commands. + +* Thu Aug 28 2014 Jamie Lennox - 0.5.1-1 +- Initial Package.