Sync from SUSE:ALP:Source:Standard:1.0 python-requests-unixsocket revision c7a52f53d29e9b2e801fd0901dedebac

This commit is contained in:
Adrian Schröter 2023-06-06 15:17:38 +02:00
commit ea6fcf9214
5 changed files with 189 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

View File

@ -0,0 +1,51 @@
-------------------------------------------------------------------
Tue May 9 11:44:12 UTC 2023 - Daniel Garcia <daniel.garcia@suse.com>
- Add urllib3-2.patch to make it compatible with urllib3 >= 2.0.0
gh#msabramo/requests-unixsocket#69
-------------------------------------------------------------------
Mon Jan 10 22:30:46 UTC 2022 - Dirk Müller <dmueller@suse.com>
- update to 0.3.0:
* Remove urllib3 dep
* Update setup.cfg metadata - => \_
* Remove Vagrantfile
* Remove .travis.yml
* Update tox to work
* README.rst: Update badge from Travis => GH
* Fix warning from waitress
* Add GitHub Actions tests
* Remove --pep8 option to pytest
* Bump waitress from 1.4.2 to 1.4.3
* Bump py from 1.4.32 to 1.10.0
* Bump waitress from 0.9.0 to 1.4.2
* Allow UnixAdapter to accept max\_retries parameter
-------------------------------------------------------------------
Wed Aug 28 08:48:45 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
- update to version 0.2.0
* Remove support for Python 2.6
* Add support for Python 3.6
* Add Python 3.7
* Close socket on deletion
* Allow UnixAdapter to accept max_retries parameter
* Many other changes
-------------------------------------------------------------------
Wed Mar 20 18:39:29 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Make the descriptions say what it is, not what the user is to do.
-------------------------------------------------------------------
Tue Mar 5 12:40:55 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Switch to singlespec to support all python variants
- Make sure we run tests
-------------------------------------------------------------------
Fri Mar 11 08:27:38 UTC 2016 - tbechtold@suse.com
- Initial packaging (version 0.1.5)

View File

@ -0,0 +1,67 @@
#
# spec file for package python-requests-unixsocket
#
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: python-requests-unixsocket
Version: 0.3.0
Release: 0
Summary: UNIX domain socket backend for python-requests
License: Apache-2.0
Group: Development/Languages/Python
URL: https://github.com/msabramo/requests-unixsocket
Source: https://files.pythonhosted.org/packages/source/r/requests-unixsocket/requests-unixsocket-%{version}.tar.gz
# PATCH-FIX-UPSTREAM urllib3-2.patch -- gh#msabramo/requests-unixsocket#69
Patch0: urllib3-2.patch
BuildRequires: %{python_module pbr}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-requests >= 1.1
BuildArch: noarch
# SECTION test requirements
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module requests >= 1.1}
BuildRequires: %{python_module waitress}
# /SECTION
%python_subpackages
%description
With this module, python-requests is enhanced by the ability to talk
HTTP via a UNIX domain socket.
%prep
%autosetup -p1 -n requests-unixsocket-%{version}
# do not require additional test deps
sed -i -e '/addopts/d' pytest.ini
%build
%python_build
%install
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
%pytest requests_unixsocket/tests
%files %{python_files}
%doc AUTHORS ChangeLog README.rst
%license LICENSE
%{python_sitelib}/requests_unixsocket
%{python_sitelib}/requests_unixsocket-%{version}*-info
%changelog

BIN
requests-unixsocket-0.3.0.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

45
urllib3-2.patch Normal file
View File

@ -0,0 +1,45 @@
From 5a614f60e7b3639758a6b77691b4e0c0d6827e94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Roukala=20=28n=C3=A9=20Peres=29?=
<martin.roukala@mupuf.org>
Date: Fri, 5 May 2023 09:23:41 +0300
Subject: [PATCH] Inherit HTTPConnection through urllib3.connection, not
httplib
By inheriting from `urllib3.connection.HTTPConnection` (that inherits
from `httplib.HTTPConnection` itself), we can adapt to the internal
changes in urllib3 2.0 that added a `request()` method that is
incompatible with httplib.HTTPConnection.request.
This fixes the incompatibility between urllib3 2.0 and requests 1.26+,
which was the first version that stopped vendoring urllib3.
Reference: https://github.com/docker/docker-py/issues/3113#issuecomment-1531570788
---
requests_unixsocket/adapters.py | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
Index: requests-unixsocket-0.3.0/requests_unixsocket/adapters.py
===================================================================
--- requests-unixsocket-0.3.0.orig/requests_unixsocket/adapters.py
+++ requests-unixsocket-0.3.0/requests_unixsocket/adapters.py
@@ -4,11 +4,6 @@ from requests.adapters import HTTPAdapte
from requests.compat import urlparse, unquote
try:
- import http.client as httplib
-except ImportError:
- import httplib
-
-try:
from requests.packages import urllib3
except ImportError:
import urllib3
@@ -16,7 +11,7 @@ except ImportError:
# The following was adapted from some code from docker-py
# https://github.com/docker/docker-py/blob/master/docker/transport/unixconn.py
-class UnixHTTPConnection(httplib.HTTPConnection, object):
+class UnixHTTPConnection(urllib3.connection.HTTPConnection, object):
def __init__(self, unix_socket_url, timeout=60):
"""Create an HTTP connection to a unix domain socket