Sync from SUSE:SLFO:1.1 python-elastic-transport revision a176809f6268678a514f4d565fc89e13

python-elastic-transport.changes

@@ -1,34 +1,3 @@
--------------------------------------------------------------------
-Wed Jan  8 09:45:07 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
-
-- 8.17.0: 
-  * Fix use of SSLContext with sniffing (#199)
-  * Fix enabled_cleanup_closed warning (#202)
-  * Remove unneeded install requirement (#196)
-
--------------------------------------------------------------------
-Thu Dec 12 15:56:05 UTC 2024 - Ben Greiner <code@bnavigator.de>
-
-- Update test runs: pytest 8 is supported, httpx 0.28 creates
-  problems 
-
--------------------------------------------------------------------
-Thu Dec  5 10:45:51 UTC 2024 - Daniel Garcia <daniel.garcia@suse.com>
-
-- drop remove-mock.patch, it's part of upstream now.
-- Update to 8.15.1
-  * Add explicit Python 3.13 support (#189)
-- 8.15.0:
-  * Removed call to raise_for_status() when using HttpxAsyncHttpNode
-    to prevent exceptions being raised for 404 responses (#182)
-  * Documented response classes (#175)
-  * Dropped support for Python 3.7 (#179)
-
--------------------------------------------------------------------
-Fri Jun 21 07:55:47 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
-
-- Skip some failing tests with pytest 8.x. 
-
 -------------------------------------------------------------------
 Thu Jun  6 09:45:48 UTC 2024 - Markéta Machová <mmachova@suse.com>
 

python-elastic-transport.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-elastic-transport
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,12 +18,14 @@
 
 %{?sle15_python_module_pythons}
 Name:           python-elastic-transport
-Version:        8.17.0
+Version:        8.13.1
 Release:        0
 Summary:        Transport classes and utilities shared among Python Elastic client libraries
 License:        Apache-2.0
 URL:            https://github.com/elastic/elastic-transport-python
 Source:         https://github.com/elastic/elastic-transport-python/archive/refs/tags/v%{version}.tar.gz#/elastic-transport-python-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM gh#elastic/elastic-transport-python#163
+Patch1:         remove-mock.patch
 BuildRequires:  %{python_module base >= 3.7}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
@@ -71,14 +73,9 @@ donttest="(test_http_aiohttp and not TestAiohttpHttpNode)"
 donttest="$donttest or test_tls_versions"
 donttest="$donttest or test_assert_fingerprint_in_cert_chain"
 donttest="$donttest or (test_ssl_assert_fingerprint and httpx)"
-# Fails in 3.12 with DeprecationWarning
+# gh#elastic/elastic-transport-python#96
-donttest="$donttest or test_simple_request"
+donttest="$donttest or test_url_to_node_config[https://[::1]:0/-https://[::1]:0-]"
-# Mocking error with httpx 0.28 / patched respx
+%pytest -k "not ($donttest)"
-donttest="$donttest or (TestHttpxAsyncNode and not Creation)"
-# Flaky test
-donttest="$donttest or test_decimal_serialization[OrjsonSerializer]"
-donttest="$donttest or test_sniff_before_requests or test_sniffed_nodes_added_to_pool or test_sniff_on_node_failure"
-%pytest -W ignore::DeprecationWarning -k "not ($donttest)"
 
 %files %{python_files}
 %doc CHANGELOG.md README.md

remove-mock.patch

@@ -0,0 +1,59 @@
+From 20d207e59f17f9539af12626e2f832f9ad094025 Mon Sep 17 00:00:00 2001
+From: Steve Kowalik <steven@wedontsleep.org>
+Date: Mon, 20 May 2024 11:51:43 +1000
+Subject: [PATCH] Remove last uses of mock
+
+The node tests still relied on the external mock library for mocking,
+whereas other tests have transitioned to unittest.mock. Since we support
+Python 3.7 and greater, we can remove that requirement and pull them in
+line too.
+---
+ setup.py                         | 1 -
+ tests/node/test_http_requests.py | 2 +-
+ tests/node/test_http_urllib3.py  | 2 +-
+ 3 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index c145012..17370a7 100644
+--- a/setup.py
++++ b/setup.py
+@@ -63,7 +63,6 @@
+             "pytest-asyncio",
+             "pytest-httpserver",
+             "trustme",
+-            "mock",
+             "requests",
+             "aiohttp",
+             "httpx",
+diff --git a/tests/node/test_http_requests.py b/tests/node/test_http_requests.py
+index 2ff7bc0..3a99854 100644
+--- a/tests/node/test_http_requests.py
++++ b/tests/node/test_http_requests.py
+@@ -18,10 +18,10 @@
+ import gzip
+ import ssl
+ import warnings
++from unittest.mock import Mock, patch
+ 
+ import pytest
+ import requests
+-from mock import Mock, patch
+ from requests.auth import HTTPBasicAuth
+ 
+ from elastic_transport import NodeConfig, RequestsHttpNode
+diff --git a/tests/node/test_http_urllib3.py b/tests/node/test_http_urllib3.py
+index fad11e7..25bd920 100644
+--- a/tests/node/test_http_urllib3.py
++++ b/tests/node/test_http_urllib3.py
+@@ -19,10 +19,10 @@
+ import re
+ import ssl
+ import warnings
++from unittest.mock import Mock, patch
+ 
+ import pytest
+ import urllib3
+-from mock import Mock, patch
+ from urllib3.response import HTTPHeaderDict
+ 
+ from elastic_transport import NodeConfig, TransportError, Urllib3HttpNode