From 177688ec4c1e1621695773a16be1c62fbb8aa51f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 12:38:52 +0000 Subject: [PATCH 01/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-httmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-httmock.spec b/python-httmock.spec index 4de895e..2607e48 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -4,7 +4,7 @@ Name: python-%{pypi_name} Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A mocking library for requests License: ASL 2.0 @@ -53,6 +53,9 @@ cp %{SOURCE1} . %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Nov 13 2019 Steve Traylen - 1.3.0-1 - Update to 1.3.0 From 4a519a2892cff156c75da69f42c1173fe7d64ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:19:13 +0200 Subject: [PATCH 02/27] Rebuilt for Python 3.9 --- python-httmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-httmock.spec b/python-httmock.spec index 2607e48..085117b 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -4,7 +4,7 @@ Name: python-%{pypi_name} Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A mocking library for requests License: ASL 2.0 @@ -53,6 +53,9 @@ cp %{SOURCE1} . %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %changelog +* Tue May 26 2020 Miro Hrončok - 1.3.0-3 +- Rebuilt for Python 3.9 + * Thu Jan 30 2020 Fedora Release Engineering - 1.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From eec796529298eb5d4f03b34def63364de2c36a6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 13 Jul 2020 21:04:33 +0200 Subject: [PATCH 03/27] Replace Python version glob with macro (needed for Python 3.10+) See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/PQIGCQCRNBYNXBX2ICWEM3PLDLNOG2ZT/ Co-authored-by: Tomas Hrnciar --- python-httmock.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-httmock.spec b/python-httmock.spec index 085117b..c28aa6d 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -50,7 +50,7 @@ cp %{SOURCE1} . %doc README.md %{python3_sitelib}/__pycache__/* %{python3_sitelib}/%{pypi_name}.py -%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info +%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog * Tue May 26 2020 Miro Hrončok - 1.3.0-3 From 25fa48a59e711acb6e5326d2ad4947a3bad68c93 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 01:28:39 +0000 Subject: [PATCH 04/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-httmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-httmock.spec b/python-httmock.spec index c28aa6d..33be6c1 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -4,7 +4,7 @@ Name: python-%{pypi_name} Version: 1.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A mocking library for requests License: ASL 2.0 @@ -53,6 +53,9 @@ cp %{SOURCE1} . %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 1.3.0-3 - Rebuilt for Python 3.9 From 18aa6f184d3ef6ccf97ca453d26737ce6fdfbf9c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 11:04:50 +0000 Subject: [PATCH 05/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-httmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-httmock.spec b/python-httmock.spec index 33be6c1..e03019a 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -4,7 +4,7 @@ Name: python-%{pypi_name} Version: 1.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A mocking library for requests License: ASL 2.0 @@ -53,6 +53,9 @@ cp %{SOURCE1} . %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From de30fb34ea46c201271b1024b0c21daa84a042c5 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Mon, 8 Mar 2021 10:30:46 +0100 Subject: [PATCH 06/27] Update to 1.4.0 --- .gitignore | 1 + python-httmock.spec | 7 +++++-- sources | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 99f6d2b..31d8679 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /httmock-1.2.6.tar.gz /httmock-1.3.0.tar.gz /tests.py +/httmock-1.4.0.tar.gz diff --git a/python-httmock.spec b/python-httmock.spec index e03019a..4003745 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -3,8 +3,8 @@ %global pypi_name httmock Name: python-%{pypi_name} -Version: 1.3.0 -Release: 5%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: A mocking library for requests License: ASL 2.0 @@ -53,6 +53,9 @@ cp %{SOURCE1} . %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Mon Mar 8 2021 Steve Traylen - 1.4.0-1 +- Update to 1.4.0 + * Wed Jan 27 2021 Fedora Release Engineering - 1.3.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 29df162..3d1b8d1 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (tests.py) = f869c9923bdd68c8758c1937eb61a7b8e2aae1ef32dce9ca850460dfdfd8daae7c20e1e5b9c298c1ce600900cbe2c34ba9660bd0ded0dbd34e817e39a18eee72 -SHA512 (httmock-1.3.0.tar.gz) = f713ddf45675738582a3611e01a55babce2951231b34fb9ca6b1b64fcf60a3862994ff7ad4cd7a224a116c6acb1caa267978a7cb6fedd02676fa2a01f90e93aa +SHA512 (httmock-1.4.0.tar.gz) = d8674c0bd7c667d02e100f35157f717189ddcfb14d26993a87e8823aec255d191ab6ac53da0cb4035eb37caab36f8f7c6705bf10f0d8d4de62a5aa09cddacfc4 From c07b37989bc815f606eb027262a7088fe38a9f09 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:38:07 +0200 Subject: [PATCH 07/27] Rebuilt for Python 3.10 --- python-httmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-httmock.spec b/python-httmock.spec index 4003745..7164fbf 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -4,7 +4,7 @@ Name: python-%{pypi_name} Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A mocking library for requests License: ASL 2.0 @@ -53,6 +53,9 @@ cp %{SOURCE1} . %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Fri Jun 04 2021 Python Maint - 1.4.0-2 +- Rebuilt for Python 3.10 + * Mon Mar 8 2021 Steve Traylen - 1.4.0-1 - Update to 1.4.0 From d6e9eecfcdb2b1f1f02569e3d523027818ee1fa8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 06:46:24 +0000 Subject: [PATCH 08/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-httmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-httmock.spec b/python-httmock.spec index 7164fbf..9163a41 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -4,7 +4,7 @@ Name: python-%{pypi_name} Version: 1.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A mocking library for requests License: ASL 2.0 @@ -53,6 +53,9 @@ cp %{SOURCE1} . %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 1.4.0-2 - Rebuilt for Python 3.10 From 6370a52965dce189952f0c3b03c11e25f5bc48d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 12:41:00 +0000 Subject: [PATCH 09/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-httmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-httmock.spec b/python-httmock.spec index 9163a41..df9191d 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -4,7 +4,7 @@ Name: python-%{pypi_name} Version: 1.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A mocking library for requests License: ASL 2.0 @@ -53,6 +53,9 @@ cp %{SOURCE1} . %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 1.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From f2e4b53fd333ce32e3b77710f6bc10e210fc5579 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Fri, 28 Jan 2022 09:03:37 +0000 Subject: [PATCH 10/27] Migrate tests to tox rhbz#2019409 --- 64.diff | 19 +++++++++++++++++++ python-httmock.spec | 20 +++++++++++++------- 2 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 64.diff diff --git a/64.diff b/64.diff new file mode 100644 index 0000000..7755b76 --- /dev/null +++ b/64.diff @@ -0,0 +1,19 @@ +diff --git a/tox.ini b/tox.ini +new file mode 100644 +index 0000000..e781a62 +--- /dev/null ++++ b/tox.ini +@@ -0,0 +1,13 @@ ++# Tox (https://tox.readthedocs.io) is a tool for running tests ++# in multiple virtualenvs. This configuration file will run the ++# test suite on all supported Python versions. To use it, ++# "python -m pip install tox" and then run "tox" from this directory. ++ ++[tox] ++envlist = py{27, 34, 35, 36, 37, 38, 39, 310, 311, py2, py3} ++ ++[testenv] ++deps = ++ pytest ++ requests ++commands = {envpython} -b -m pytest -W always tests.py {posargs} diff --git a/python-httmock.spec b/python-httmock.spec index df9191d..bf62fa2 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -4,13 +4,16 @@ Name: python-%{pypi_name} Version: 1.4.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A mocking library for requests License: ASL 2.0 URL: https://github.com/patrys/httmock Source0: https://files.pythonhosted.org/packages/source/h/httmock/httmock-%{version}.tar.gz Source1: https://raw.githubusercontent.com/patrys/httmock/%{version}/tests.py +# Add a tox file. +# https://bugzilla.redhat.com/show_bug.cgi?id=2019409 +Patch0: https://patch-diff.githubusercontent.com/raw/patrys/httmock/pull/64.diff BuildArch: noarch %description @@ -20,18 +23,18 @@ that use requests internally. %package -n python3-%{pypi_name} Summary: %{summary} -%{?python_provide:%python_provide python3-%{pypi_name}} BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3dist(requests) >= 1 - + +%generate_buildrequires +%pyproject_buildrequires -t + %description -n python3-%{pypi_name} A mocking library for requests for Python. You can use it to mock third-party APIs and test libraries that use requests internally. %prep -%autosetup -n %{pypi_name}-%{version} +%autosetup -p1 -n %{pypi_name}-%{version} # Remove bundled egg-info rm -rf %{pypi_name}.egg-info cp %{SOURCE1} . @@ -43,7 +46,7 @@ cp %{SOURCE1} . %py3_install %check -%{__python3} setup.py test +%{tox} %files -n python3-%{pypi_name} %license LICENSE @@ -53,6 +56,9 @@ cp %{SOURCE1} . %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Fri Jan 28 2022 Steve Traylen 1.4.0-5 +- Migrate tests to tox rhbz#2019409 + * Fri Jan 21 2022 Fedora Release Engineering - 1.4.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 98cbcd0bb02383438b922077d06843e45891e109 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 20:21:04 +0200 Subject: [PATCH 11/27] Rebuilt for Python 3.11 --- python-httmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-httmock.spec b/python-httmock.spec index bf62fa2..930d74c 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -4,7 +4,7 @@ Name: python-%{pypi_name} Version: 1.4.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A mocking library for requests License: ASL 2.0 @@ -56,6 +56,9 @@ cp %{SOURCE1} . %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Mon Jun 13 2022 Python Maint - 1.4.0-6 +- Rebuilt for Python 3.11 + * Fri Jan 28 2022 Steve Traylen 1.4.0-5 - Migrate tests to tox rhbz#2019409 From 351e29f86698c30fe1c922f02d1e1109451a001f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 19:10:42 +0000 Subject: [PATCH 12/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-httmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-httmock.spec b/python-httmock.spec index 930d74c..60a741e 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -4,7 +4,7 @@ Name: python-%{pypi_name} Version: 1.4.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A mocking library for requests License: ASL 2.0 @@ -56,6 +56,9 @@ cp %{SOURCE1} . %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1.4.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 1.4.0-6 - Rebuilt for Python 3.11 From d6f92e3e61e425f7777cef31e1be463bef006a21 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 13:50:29 +0000 Subject: [PATCH 13/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-httmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-httmock.spec b/python-httmock.spec index 60a741e..d3e21ff 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -4,7 +4,7 @@ Name: python-%{pypi_name} Version: 1.4.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A mocking library for requests License: ASL 2.0 @@ -56,6 +56,9 @@ cp %{SOURCE1} . %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 1.4.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 1.4.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 0014b0654c5272224242808b32aae435fb8c9f1c Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Fri, 5 May 2023 22:18:26 +0200 Subject: [PATCH 14/27] Complete migration to pyproject macros * Complete migration to pyproject macros * Switch SPDX license field * Use tests.py matching released version of module (rhbz#2175195) --- .gitignore | 1 - python-httmock.spec | 60 +++++++++++++++++++++++++-------------------- tests.py | 31 ++++++++++++++++++++--- 3 files changed, 61 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 31d8679..50cff98 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /httmock-1.2.6.tar.gz /httmock-1.3.0.tar.gz -/tests.py /httmock-1.4.0.tar.gz diff --git a/python-httmock.spec b/python-httmock.spec index d3e21ff..0474a21 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -1,61 +1,67 @@ -%{?python_enable_dependency_generator} -# Created by pyp2rpm-3.3.0 -%global pypi_name httmock - -Name: python-%{pypi_name} +Name: python-httmock Version: 1.4.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A mocking library for requests - -License: ASL 2.0 +License: Apache-2.0 URL: https://github.com/patrys/httmock + +# Switch to github at next release to avoid the extra Source1 Source0: https://files.pythonhosted.org/packages/source/h/httmock/httmock-%{version}.tar.gz Source1: https://raw.githubusercontent.com/patrys/httmock/%{version}/tests.py + # Add a tox file. # https://bugzilla.redhat.com/show_bug.cgi?id=2019409 Patch0: https://patch-diff.githubusercontent.com/raw/patrys/httmock/pull/64.diff BuildArch: noarch -%description +%global _description %{expand: A mocking library for requests for Python. You can use it to mock third-party APIs and test libraries -that use requests internally. +that use requests internally} -%package -n python3-%{pypi_name} + +%description %_description + +%package -n python3-httmock Summary: %{summary} BuildRequires: python3-devel +%description -n python3-httmock %_description + + +%prep +%autosetup -p1 -n httmock-%{version} +cp %{SOURCE1} . + %generate_buildrequires %pyproject_buildrequires -t -%description -n python3-%{pypi_name} -A mocking library for requests for Python. -You can use it to mock third-party APIs and test libraries -that use requests internally. - -%prep -%autosetup -p1 -n %{pypi_name}-%{version} -# Remove bundled egg-info -rm -rf %{pypi_name}.egg-info -cp %{SOURCE1} . %build -%py3_build +%pyproject_wheel + %install -%py3_install +%pyproject_install + +%pyproject_save_files httmock + %check %{tox} -%files -n python3-%{pypi_name} + +%files -n python3-httmock -f %{pyproject_files} %license LICENSE %doc README.md -%{python3_sitelib}/__pycache__/* -%{python3_sitelib}/%{pypi_name}.py -%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info + %changelog +* Fri May 05 2023 Steve Traylen 1.4.0-9 +- Complete migration to pyproject macros +- Switch SPDX license field +- Use tests.py matching released version of module (rhbz#2175195) + * Fri Jan 20 2023 Fedora Release Engineering - 1.4.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/tests.py b/tests.py index c396192..9d4cabb 100644 --- a/tests.py +++ b/tests.py @@ -66,7 +66,8 @@ def any_mock(url, request): def dict_any_mock(url, request): return { 'content': 'Hello from %s' % (url.netloc,), - 'status_code': 200 + 'status_code': 200, + 'http_vsn': 10, } @@ -136,6 +137,13 @@ class MockTest(unittest.TestCase): self.assertEqual(r.text, u'Motörhead') self.assertEqual(r.content, r.text.encode('utf-8')) + def test_has_raw_version(self): + with HTTMock(any_mock): + r = requests.get('http://example.com') + self.assertEqual(r.raw.version, 11) + with HTTMock(dict_any_mock): + r = requests.get('http://example.com') + self.assertEqual(r.raw.version, 10) class DecoratorTest(unittest.TestCase): @@ -242,6 +250,11 @@ class ResponseTest(unittest.TestCase): r = response(200, None, {'Content-Type': 'application/json'}) self.assertEqual(r.headers['content-type'], 'application/json') + def test_response_raw_version(self): + r = response(200, None, {'Content-Type': 'application/json'}, + http_vsn=10) + self.assertEqual(r.raw.version, 10) + def test_response_cookies(self): @all_requests def response_content(url, request): @@ -268,6 +281,18 @@ class ResponseTest(unittest.TestCase): self.assertTrue('foo' in session.cookies) self.assertEqual(session.cookies['foo'], 'bar') + def test_session_persistent_cookies(self): + session = requests.Session() + with HTTMock(lambda u, r: response(200, 'Foo', {'Set-Cookie': 'foo=bar;'}, request=r)): + session.get('https://foo_bar') + with HTTMock(lambda u, r: response(200, 'Baz', {'Set-Cookie': 'baz=qux;'}, request=r)): + session.get('https://baz_qux') + self.assertEqual(len(session.cookies), 2) + self.assertTrue('foo' in session.cookies) + self.assertEqual(session.cookies['foo'], 'bar') + self.assertTrue('baz' in session.cookies) + self.assertEqual(session.cookies['baz'], 'qux') + def test_python_version_encoding_differences(self): # Previous behavior would result in this test failing in Python3 due # to how requests checks for utf-8 JSON content in requests.utils with: @@ -341,7 +366,7 @@ class RememberCalledTest(unittest.TestCase): results = self.several_calls( 1, requests.get, 'http://facebook.com/') - self.assertEquals(facebook_mock_count.call['count'], 1) + self.assertEqual(facebook_mock_count.call['count'], 1) @with_httmock(google_mock_count, facebook_mock_count) def test_several_call_decorated(self): @@ -357,7 +382,7 @@ class RememberCalledTest(unittest.TestCase): self.assertEqual(r.content, b'Hello from Facebook') self.several_calls(1, requests.get, 'http://facebook.com/') - self.assertEquals(facebook_mock_count.call['count'], 4) + self.assertEqual(facebook_mock_count.call['count'], 4) def test_store_several_requests(self): with HTTMock(google_mock_store_requests): From e954390a09d9d86c67dab086012d885315bd7164 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 18:26:21 +0200 Subject: [PATCH 15/27] Rebuilt for Python 3.12 --- python-httmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-httmock.spec b/python-httmock.spec index 0474a21..afbed14 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -1,6 +1,6 @@ Name: python-httmock Version: 1.4.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A mocking library for requests License: Apache-2.0 URL: https://github.com/patrys/httmock @@ -57,6 +57,9 @@ cp %{SOURCE1} . %changelog +* Wed Jun 14 2023 Python Maint - 1.4.0-10 +- Rebuilt for Python 3.12 + * Fri May 05 2023 Steve Traylen 1.4.0-9 - Complete migration to pyproject macros - Switch SPDX license field From cec51896bc3ef4da0ebb78fc960eae19f6ef807f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 10:23:49 +0000 Subject: [PATCH 16/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-httmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-httmock.spec b/python-httmock.spec index afbed14..ca1fe7d 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -1,6 +1,6 @@ Name: python-httmock Version: 1.4.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A mocking library for requests License: Apache-2.0 URL: https://github.com/patrys/httmock @@ -57,6 +57,9 @@ cp %{SOURCE1} . %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 1.4.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jun 14 2023 Python Maint - 1.4.0-10 - Rebuilt for Python 3.12 From ba3b2a835e059014193b1482bc190ffc6098eb9f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 02:17:21 +0000 Subject: [PATCH 17/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- python-httmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-httmock.spec b/python-httmock.spec index ca1fe7d..6f216a5 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -1,6 +1,6 @@ Name: python-httmock Version: 1.4.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A mocking library for requests License: Apache-2.0 URL: https://github.com/patrys/httmock @@ -57,6 +57,9 @@ cp %{SOURCE1} . %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.4.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 1.4.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 4fc78b39a40379d957fb5b11995fc8acf0c5f5d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 05:14:24 +0000 Subject: [PATCH 18/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- python-httmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-httmock.spec b/python-httmock.spec index 6f216a5..fc4eae1 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -1,6 +1,6 @@ Name: python-httmock Version: 1.4.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A mocking library for requests License: Apache-2.0 URL: https://github.com/patrys/httmock @@ -57,6 +57,9 @@ cp %{SOURCE1} . %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 1.4.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 1.4.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From bc186ff056f0f1f2de7ca829d314091baf57d820 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 15:22:45 +0200 Subject: [PATCH 19/27] Rebuilt for Python 3.13 --- python-httmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-httmock.spec b/python-httmock.spec index fc4eae1..bcf0ead 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -1,6 +1,6 @@ Name: python-httmock Version: 1.4.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A mocking library for requests License: Apache-2.0 URL: https://github.com/patrys/httmock @@ -57,6 +57,9 @@ cp %{SOURCE1} . %changelog +* Fri Jun 07 2024 Python Maint - 1.4.0-14 +- Rebuilt for Python 3.13 + * Fri Jan 26 2024 Fedora Release Engineering - 1.4.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 94d72aa5c207a3a9f43c558c6f3e29cef69734fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 12:10:47 +0000 Subject: [PATCH 20/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- python-httmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-httmock.spec b/python-httmock.spec index bcf0ead..fa08830 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -1,6 +1,6 @@ Name: python-httmock Version: 1.4.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A mocking library for requests License: Apache-2.0 URL: https://github.com/patrys/httmock @@ -57,6 +57,9 @@ cp %{SOURCE1} . %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 1.4.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 1.4.0-14 - Rebuilt for Python 3.13 From d931f4b75aa2266e2a5d4ad805c3d33c4ea2ea21 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 15:00:27 +0000 Subject: [PATCH 21/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- python-httmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-httmock.spec b/python-httmock.spec index fa08830..7e0ef8e 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -1,6 +1,6 @@ Name: python-httmock Version: 1.4.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A mocking library for requests License: Apache-2.0 URL: https://github.com/patrys/httmock @@ -57,6 +57,9 @@ cp %{SOURCE1} . %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 1.4.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 19 2024 Fedora Release Engineering - 1.4.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From f44b8e05c0f5d0cb73224c926e2459a90c570904 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Sat, 15 Feb 2025 17:32:12 +0100 Subject: [PATCH 22/27] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 92 +++++++++++++++++++++++++++++++++++++++++++ python-httmock.spec | 95 +-------------------------------------------- 2 files changed, 94 insertions(+), 93 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..29ef604 --- /dev/null +++ b/changelog @@ -0,0 +1,92 @@ +* Sat Jan 18 2025 Fedora Release Engineering - 1.4.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 19 2024 Fedora Release Engineering - 1.4.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 1.4.0-14 +- Rebuilt for Python 3.13 + +* Fri Jan 26 2024 Fedora Release Engineering - 1.4.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 1.4.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 1.4.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jun 14 2023 Python Maint - 1.4.0-10 +- Rebuilt for Python 3.12 + +* Fri May 05 2023 Steve Traylen 1.4.0-9 +- Complete migration to pyproject macros +- Switch SPDX license field +- Use tests.py matching released version of module (rhbz#2175195) + +* Fri Jan 20 2023 Fedora Release Engineering - 1.4.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 1.4.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 1.4.0-6 +- Rebuilt for Python 3.11 + +* Fri Jan 28 2022 Steve Traylen 1.4.0-5 +- Migrate tests to tox rhbz#2019409 + +* Fri Jan 21 2022 Fedora Release Engineering - 1.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 1.4.0-2 +- Rebuilt for Python 3.10 + +* Mon Mar 8 2021 Steve Traylen - 1.4.0-1 +- Update to 1.4.0 + +* Wed Jan 27 2021 Fedora Release Engineering - 1.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 1.3.0-3 +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Nov 13 2019 Steve Traylen - 1.3.0-1 +- Update to 1.3.0 + +* Thu Oct 03 2019 Miro Hrončok - 1.2.6-9 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 1.2.6-8 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 1.2.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 1.2.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jan 04 2019 Igor Gnatenko - 1.2.6-5 +- Enable python dependency generator + +* Fri Jan 04 2019 Miro Hrončok - 1.2.6-4 +- Subpackage python2-httmock has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Sat Jul 14 2018 Fedora Release Engineering - 1.2.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 1.2.6-2 +- Rebuilt for Python 3.7 + +* Fri May 11 2018 Steve Traylen - 1.2.6-1 +- Initial package. diff --git a/python-httmock.spec b/python-httmock.spec index 7e0ef8e..596edac 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -1,6 +1,6 @@ Name: python-httmock Version: 1.4.0 -Release: 16%{?dist} +Release: %autorelease Summary: A mocking library for requests License: Apache-2.0 URL: https://github.com/patrys/httmock @@ -57,95 +57,4 @@ cp %{SOURCE1} . %changelog -* Sat Jan 18 2025 Fedora Release Engineering - 1.4.0-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 1.4.0-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jun 07 2024 Python Maint - 1.4.0-14 -- Rebuilt for Python 3.13 - -* Fri Jan 26 2024 Fedora Release Engineering - 1.4.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 1.4.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 1.4.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jun 14 2023 Python Maint - 1.4.0-10 -- Rebuilt for Python 3.12 - -* Fri May 05 2023 Steve Traylen 1.4.0-9 -- Complete migration to pyproject macros -- Switch SPDX license field -- Use tests.py matching released version of module (rhbz#2175195) - -* Fri Jan 20 2023 Fedora Release Engineering - 1.4.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 1.4.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 1.4.0-6 -- Rebuilt for Python 3.11 - -* Fri Jan 28 2022 Steve Traylen 1.4.0-5 -- Migrate tests to tox rhbz#2019409 - -* Fri Jan 21 2022 Fedora Release Engineering - 1.4.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 1.4.0-2 -- Rebuilt for Python 3.10 - -* Mon Mar 8 2021 Steve Traylen - 1.4.0-1 -- Update to 1.4.0 - -* Wed Jan 27 2021 Fedora Release Engineering - 1.3.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.3.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 1.3.0-3 -- Rebuilt for Python 3.9 - -* Thu Jan 30 2020 Fedora Release Engineering - 1.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Nov 13 2019 Steve Traylen - 1.3.0-1 -- Update to 1.3.0 - -* Thu Oct 03 2019 Miro Hrončok - 1.2.6-9 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Miro Hrončok - 1.2.6-8 -- Rebuilt for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 1.2.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 1.2.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jan 04 2019 Igor Gnatenko - 1.2.6-5 -- Enable python dependency generator - -* Fri Jan 04 2019 Miro Hrončok - 1.2.6-4 -- Subpackage python2-httmock has been removed - See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal - -* Sat Jul 14 2018 Fedora Release Engineering - 1.2.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 1.2.6-2 -- Rebuilt for Python 3.7 - -* Fri May 11 2018 Steve Traylen - 1.2.6-1 -- Initial package. +%autochangelog From 0a49c780e6fd35d3296b2555719669d92ddacae3 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Sat, 15 Feb 2025 17:35:23 +0100 Subject: [PATCH 23/27] Add packit file [skip changelog] --- .packit.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..1d68e68 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,25 @@ +--- +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +upstream_project_url: https://github.com/patrys/httmock +copy_upstream_release_description: false +upstream_tag_include: '^\d+\.\d+\.\d+$' + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + - epel10 + - job: koji_build + trigger: commit + allowed_committers: ['packit','all_admins'] + dist_git_branches: + - fedora-rawhide + - epel10 + - job: bodhi_update + trigger: commit + allowed_builders: ['packit','all_users'] + dist_git_branches: + - fedora-rawhide From 1783e513ccae99c684caac18a8c6f63bde50b552 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 10:41:08 +0200 Subject: [PATCH 24/27] Rebuilt for Python 3.14 From de2ac30ee83c45d83cfaef140dbb01d74baaa108 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 08:15:51 +0000 Subject: [PATCH 25/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 454c9f9e8cd1b166a91feac0fff699b383ddc1fe Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 13:52:49 +0200 Subject: [PATCH 26/27] Rebuilt for Python 3.14.0rc2 bytecode From d0e6456bb471f54e151f9825a6d8e555e128f662 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 13:26:34 +0200 Subject: [PATCH 27/27] Rebuilt for Python 3.14.0rc3 bytecode