Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-aiohttp-socks for
openSUSE:Factory checked in at 2021-04-23 17:50:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-aiohttp-socks (Old)
and /work/SRC/openSUSE:Factory/.python-aiohttp-socks.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-aiohttp-socks"
Fri Apr 23 17:50:35 2021 rev:4 rq:887218 version:0.6.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-aiohttp-socks/python-aiohttp-socks.changes
2021-02-23 20:23:06.323798954 +0100
+++
/work/SRC/openSUSE:Factory/.python-aiohttp-socks.new.12324/python-aiohttp-socks.changes
2021-04-23 17:50:51.554818272 +0200
@@ -1,0 +2,8 @@
+Wed Apr 21 05:47:04 UTC 2021 - Jiri Slaby <[email protected]>
+
+- Update to 0.6.0:
+ * Use a custom proxy server and local http server for tests
+ * Use python-socks extended API
+- Add a simple import test at least
+
+-------------------------------------------------------------------
Old:
----
aiohttp_socks-0.5.5.tar.gz
New:
----
aiohttp_socks-0.6.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-aiohttp-socks.spec ++++++
--- /var/tmp/diff_new_pack.Emsnsr/_old 2021-04-23 17:50:51.930818919 +0200
+++ /var/tmp/diff_new_pack.Emsnsr/_new 2021-04-23 17:50:51.934818926 +0200
@@ -19,7 +19,7 @@
%define skip_python2 1
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-aiohttp-socks
-Version: 0.5.5
+Version: 0.6.0
Release: 0
Summary: SOCKS proxy connector for aiohttp
License: Apache-2.0
@@ -31,11 +31,14 @@
BuildRequires: python-rpm-macros
Requires: python-aiohttp >= 2.3.2
Requires: python-attrs >= 19.2.0
+Requires: python-python-socks >= 1.0.1
BuildArch: noarch
# SECTION test requirements
-#BuildRequires: %{python_module aiohttp >= 2.3.2}
-#BuildRequires: %{python_module pytest-asyncio}
-#BuildRequires: %{python_module pytest}
+BuildRequires: %{python_module aiohttp >= 2.3.2}
+BuildRequires: %{python_module attrs >= 1.0.1}
+#BuildRequires: %%{python_module pytest-asyncio}
+BuildRequires: %{python_module python-socks >= 1.0.1}
+#BuildRequires: %%{python_module pytest}
#BuildRequires: 3proxy
# /SECTION
%python_subpackages
@@ -58,6 +61,9 @@
# tests need access to the internet
#%%pytest
+# so try at least a simple import
+echo 'from aiohttp_socks import ProxyConnector'|python3
+
%files %{python_files}
%doc README.md
%license LICENSE.txt
++++++ aiohttp_socks-0.5.5.tar.gz -> aiohttp_socks-0.6.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aiohttp_socks-0.5.5/PKG-INFO
new/aiohttp_socks-0.6.0/PKG-INFO
--- old/aiohttp_socks-0.5.5/PKG-INFO 2020-09-22 09:58:19.000000000 +0200
+++ new/aiohttp_socks-0.6.0/PKG-INFO 2021-03-01 11:50:56.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: aiohttp_socks
-Version: 0.5.5
+Version: 0.6.0
Summary: Proxy connector for aiohttp
Home-page: https://github.com/romis2012/aiohttp-socks
Author: Roman Snegirev
@@ -8,9 +8,10 @@
License: Apache 2
Description: ## aiohttp-socks
- [](https://travis-ci.org/romis2012/aiohttp-socks)
+ [](https://travis-ci.com/github/romis2012/aiohttp-socks)
[](https://coveralls.io/github/romis2012/aiohttp-socks?branch=master)
[](https://badge.fury.io/py/aiohttp-socks)
+
[](https://pepy.tech/project/aiohttp-socks)
The `aiohttp-socks` package provides a proxy connector for
[aiohttp](https://github.com/aio-libs/aiohttp).
Supports SOCKS4(a), SOCKS5, HTTP (tunneling) as well as Proxy chains.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aiohttp_socks-0.5.5/README.md
new/aiohttp_socks-0.6.0/README.md
--- old/aiohttp_socks-0.5.5/README.md 2020-09-20 15:45:02.000000000 +0200
+++ new/aiohttp_socks-0.6.0/README.md 2021-01-17 10:06:13.000000000 +0100
@@ -1,8 +1,9 @@
## aiohttp-socks
-[](https://travis-ci.org/romis2012/aiohttp-socks)
+[](https://travis-ci.com/github/romis2012/aiohttp-socks)
[](https://coveralls.io/github/romis2012/aiohttp-socks?branch=master)
[](https://badge.fury.io/py/aiohttp-socks)
+[](https://pepy.tech/project/aiohttp-socks)
The `aiohttp-socks` package provides a proxy connector for
[aiohttp](https://github.com/aio-libs/aiohttp).
Supports SOCKS4(a), SOCKS5, HTTP (tunneling) as well as Proxy chains.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aiohttp_socks-0.5.5/aiohttp_socks/__init__.py
new/aiohttp_socks-0.6.0/aiohttp_socks/__init__.py
--- old/aiohttp_socks-0.5.5/aiohttp_socks/__init__.py 2020-09-22
09:53:59.000000000 +0200
+++ new/aiohttp_socks-0.6.0/aiohttp_socks/__init__.py 2021-03-01
11:33:15.000000000 +0100
@@ -1,5 +1,5 @@
__title__ = 'aiohttp-socks'
-__version__ = '0.5.5'
+__version__ = '0.6.0'
from python_socks import (
ProxyError,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aiohttp_socks-0.5.5/aiohttp_socks/connector.py
new/aiohttp_socks-0.6.0/aiohttp_socks/connector.py
--- old/aiohttp_socks-0.5.5/aiohttp_socks/connector.py 2020-09-20
14:19:38.000000000 +0200
+++ new/aiohttp_socks-0.6.0/aiohttp_socks/connector.py 2021-03-01
11:24:35.000000000 +0100
@@ -6,8 +6,8 @@
from aiohttp.abc import AbstractResolver
from python_socks import ProxyType, parse_proxy_url
-from python_socks.async_ import ProxyChain
-from python_socks.async_.asyncio import Proxy
+from python_socks.async_.asyncio.ext import Proxy
+from python_socks.async_.asyncio.ext import ProxyChain
class NoResolver(AbstractResolver):
@@ -38,7 +38,7 @@
# noinspection PyMethodOverriding
async def _wrap_create_connection(self, protocol_factory,
- host, port, **kwargs):
+ host, port, *, ssl, **kwargs):
proxy = Proxy.create(
proxy_type=self._proxy_type,
host=self._proxy_host,
@@ -55,16 +55,21 @@
if timeout is not None:
connect_timeout = getattr(timeout, 'sock_connect', None)
- sock = await proxy.connect(host, port, timeout=connect_timeout)
-
- return await super()._wrap_create_connection(
- protocol_factory,
- None,
- None,
- sock=sock,
- **kwargs
+ stream = await proxy.connect(
+ dest_host=host,
+ dest_port=port,
+ dest_ssl=ssl,
+ timeout=connect_timeout
)
+ transport = stream.writer.transport
+ protocol = protocol_factory()
+
+ transport.set_protocol(protocol)
+ protocol.transport = transport
+
+ return transport, protocol
+
@classmethod
def from_url(cls, url, **kwargs):
proxy_type, host, port, username, password = parse_proxy_url(url)
@@ -97,7 +102,7 @@
# noinspection PyMethodOverriding
async def _wrap_create_connection(self, protocol_factory,
- host, port, **kwargs):
+ host, port, *, ssl, **kwargs):
proxies = []
for info in self._proxy_infos:
proxy = Proxy.create(
@@ -119,16 +124,21 @@
if timeout is not None:
connect_timeout = getattr(timeout, 'sock_connect', None)
- sock = await proxy.connect(host, port, timeout=connect_timeout)
-
- return await super()._wrap_create_connection(
- protocol_factory,
- None,
- None,
- sock=sock,
- **kwargs
+ stream = await proxy.connect(
+ dest_host=host,
+ dest_port=port,
+ dest_ssl=ssl,
+ timeout=connect_timeout
)
+ transport = stream.writer.transport
+ protocol = protocol_factory()
+
+ transport.set_protocol(protocol)
+ protocol.transport = transport
+
+ return transport, protocol
+
@classmethod
def from_urls(cls, urls: Iterable[str], **kwargs):
infos = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aiohttp_socks-0.5.5/aiohttp_socks.egg-info/PKG-INFO
new/aiohttp_socks-0.6.0/aiohttp_socks.egg-info/PKG-INFO
--- old/aiohttp_socks-0.5.5/aiohttp_socks.egg-info/PKG-INFO 2020-09-22
09:58:19.000000000 +0200
+++ new/aiohttp_socks-0.6.0/aiohttp_socks.egg-info/PKG-INFO 2021-03-01
11:50:56.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: aiohttp-socks
-Version: 0.5.5
+Version: 0.6.0
Summary: Proxy connector for aiohttp
Home-page: https://github.com/romis2012/aiohttp-socks
Author: Roman Snegirev
@@ -8,9 +8,10 @@
License: Apache 2
Description: ## aiohttp-socks
- [](https://travis-ci.org/romis2012/aiohttp-socks)
+ [](https://travis-ci.com/github/romis2012/aiohttp-socks)
[](https://coveralls.io/github/romis2012/aiohttp-socks?branch=master)
[](https://badge.fury.io/py/aiohttp-socks)
+
[](https://pepy.tech/project/aiohttp-socks)
The `aiohttp-socks` package provides a proxy connector for
[aiohttp](https://github.com/aio-libs/aiohttp).
Supports SOCKS4(a), SOCKS5, HTTP (tunneling) as well as Proxy chains.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/aiohttp_socks-0.5.5/aiohttp_socks.egg-info/requires.txt
new/aiohttp_socks-0.6.0/aiohttp_socks.egg-info/requires.txt
--- old/aiohttp_socks-0.5.5/aiohttp_socks.egg-info/requires.txt 2020-09-22
09:58:19.000000000 +0200
+++ new/aiohttp_socks-0.6.0/aiohttp_socks.egg-info/requires.txt 2021-03-01
11:50:56.000000000 +0100
@@ -1,3 +1,3 @@
aiohttp>=2.3.2
attrs>=19.2.0
-python-socks[asyncio]>=1.0.1
+python-socks[asyncio]>=1.2.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aiohttp_socks-0.5.5/setup.py
new/aiohttp_socks-0.6.0/setup.py
--- old/aiohttp_socks-0.5.5/setup.py 2020-09-20 14:17:57.000000000 +0200
+++ new/aiohttp_socks-0.6.0/setup.py 2021-03-01 11:16:34.000000000 +0100
@@ -40,6 +40,6 @@
install_requires=[
'aiohttp>=2.3.2',
'attrs>=19.2.0',
- 'python-socks[asyncio]>=1.0.1',
+ 'python-socks[asyncio]>=1.2.2',
],
)
