Hello community, here is the log from the commit of package python-docker for openSUSE:Factory checked in at 2019-04-02 09:22:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-docker (Old) and /work/SRC/openSUSE:Factory/.python-docker.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-docker" Tue Apr 2 09:22:51 2019 rev:14 rq:690379 version:3.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-docker/python-docker.changes 2019-03-28 22:48:28.931056964 +0100 +++ /work/SRC/openSUSE:Factory/.python-docker.new.25356/python-docker.changes 2019-04-02 09:22:52.736733010 +0200 @@ -1,0 +2,8 @@ +Mon Apr 1 13:24:35 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Update to 3.7.2: + * Fix base_url to keep TCP protocol on utils.py by letting the responsability of changing the + protocol to parse_host afterwards, letting base_url with the original value. + * XFAIL test_attach_stream_and_cancel on TLS + +------------------------------------------------------------------- Old: ---- 3.7.1.tar.gz New: ---- 3.7.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-docker.spec ++++++ --- /var/tmp/diff_new_pack.E4XkPN/_old 2019-04-02 09:22:53.284733377 +0200 +++ /var/tmp/diff_new_pack.E4XkPN/_new 2019-04-02 09:22:53.284733377 +0200 @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define oldpython python Name: python-docker -Version: 3.7.1 +Version: 3.7.2 Release: 0 Summary: Docker API Client License: Apache-2.0 @@ -77,7 +77,7 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%python_expand py.test-%{$python_bin_suffix} tests/unit +%pytest tests/unit %files %{python_files} %license LICENSE ++++++ 3.7.1.tar.gz -> 3.7.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-py-3.7.1/docker/utils/utils.py new/docker-py-3.7.2/docker/utils/utils.py --- old/docker-py-3.7.1/docker/utils/utils.py 2019-03-20 13:49:36.000000000 +0100 +++ new/docker-py-3.7.2/docker/utils/utils.py 2019-03-28 17:30:26.000000000 +0100 @@ -352,9 +352,7 @@ params = {} if host: - params['base_url'] = ( - host.replace('tcp://', 'https://') if enable_tls else host - ) + params['base_url'] = host if not enable_tls: return params diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-py-3.7.1/docker/version.py new/docker-py-3.7.2/docker/version.py --- old/docker-py-3.7.1/docker/version.py 2019-03-20 13:49:36.000000000 +0100 +++ new/docker-py-3.7.2/docker/version.py 2019-03-28 17:30:26.000000000 +0100 @@ -1,2 +1,2 @@ -version = "3.7.1" +version = "3.7.2" version_info = tuple([int(d) for d in version.split("-")[0].split(".")]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-py-3.7.1/docs/change-log.md new/docker-py-3.7.2/docs/change-log.md --- old/docker-py-3.7.1/docs/change-log.md 2019-03-20 13:49:36.000000000 +0100 +++ new/docker-py-3.7.2/docs/change-log.md 2019-03-28 17:30:26.000000000 +0100 @@ -1,6 +1,17 @@ Change log ========== +3.7.2 +----- + +[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/59?closed=1) + +### Bugfixes + +* Fix base_url to keep TCP protocol on utils.py by letting the responsability of changing the +protocol to `parse_host` afterwards, letting `base_url` with the original value. +* XFAIL test_attach_stream_and_cancel on TLS + 3.7.1 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-py-3.7.1/scripts/versions.py new/docker-py-3.7.2/scripts/versions.py --- old/docker-py-3.7.1/scripts/versions.py 2019-03-20 13:49:36.000000000 +0100 +++ new/docker-py-3.7.2/scripts/versions.py 2019-03-28 17:30:26.000000000 +0100 @@ -62,13 +62,9 @@ for url in [base_url.format(cat) for cat in categories]: res = requests.get(url) content = res.text - versions = [ - Version.parse( - v.strip('"').lstrip('docker-').rstrip('.tgz').rstrip('-x86_64') - ) for v in re.findall( - r'"docker-[0-9]+\.[0-9]+\.[0-9]+-?.*tgz"', content - ) - ] + versions = [Version.parse(v) for v in re.findall( + r'"docker-([0-9]+\.[0-9]+\.[0-9]+)-?.*tgz"', content + )] sorted_versions = sorted( versions, reverse=True, key=operator.attrgetter('order') ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-py-3.7.1/tests/integration/api_container_test.py new/docker-py-3.7.2/tests/integration/api_container_test.py --- old/docker-py-3.7.1/tests/integration/api_container_test.py 2019-03-20 13:49:36.000000000 +0100 +++ new/docker-py-3.7.2/tests/integration/api_container_test.py 2019-03-28 17:30:26.000000000 +0100 @@ -1080,7 +1080,6 @@ class PortTest(BaseAPIIntegrationTest): def test_port(self): - port_bindings = { '1111': ('127.0.0.1', '4567'), '2222': ('127.0.0.1', '4568') @@ -1260,6 +1259,9 @@ @pytest.mark.timeout(5) @pytest.mark.skipif(os.environ.get('DOCKER_HOST', '').startswith('ssh://'), reason='No cancellable streams over SSH') + @pytest.mark.xfail(condition=os.environ.get('DOCKER_TLS_VERIFY') or + os.environ.get('DOCKER_CERT_PATH'), + reason='Flaky test on TLS') def test_attach_stream_and_cancel(self): container = self.client.create_container( BUSYBOX, 'sh -c "echo hello && sleep 60"', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-py-3.7.1/tests/unit/utils_test.py new/docker-py-3.7.2/tests/unit/utils_test.py --- old/docker-py-3.7.1/tests/unit/utils_test.py 2019-03-20 13:49:36.000000000 +0100 +++ new/docker-py-3.7.2/tests/unit/utils_test.py 2019-03-28 17:30:26.000000000 +0100 @@ -11,6 +11,7 @@ from docker.api.client import APIClient +from docker.constants import IS_WINDOWS_PLATFORM from docker.errors import DockerException from docker.utils import ( convert_filters, convert_volume_binds, decode_json_header, kwargs_from_env, @@ -83,15 +84,17 @@ DOCKER_CERT_PATH=TEST_CERT_DIR, DOCKER_TLS_VERIFY='1') kwargs = kwargs_from_env(assert_hostname=False) - assert 'https://192.168.59.103:2376' == kwargs['base_url'] + assert 'tcp://192.168.59.103:2376' == kwargs['base_url'] assert 'ca.pem' in kwargs['tls'].ca_cert assert 'cert.pem' in kwargs['tls'].cert[0] assert 'key.pem' in kwargs['tls'].cert[1] assert kwargs['tls'].assert_hostname is False assert kwargs['tls'].verify + + parsed_host = parse_host(kwargs['base_url'], IS_WINDOWS_PLATFORM, True) try: client = APIClient(**kwargs) - assert kwargs['base_url'] == client.base_url + assert parsed_host == client.base_url assert kwargs['tls'].ca_cert == client.verify assert kwargs['tls'].cert == client.cert except TypeError as e: @@ -102,15 +105,16 @@ DOCKER_CERT_PATH=TEST_CERT_DIR, DOCKER_TLS_VERIFY='') kwargs = kwargs_from_env(assert_hostname=True) - assert 'https://192.168.59.103:2376' == kwargs['base_url'] + assert 'tcp://192.168.59.103:2376' == kwargs['base_url'] assert 'ca.pem' in kwargs['tls'].ca_cert assert 'cert.pem' in kwargs['tls'].cert[0] assert 'key.pem' in kwargs['tls'].cert[1] assert kwargs['tls'].assert_hostname is True assert kwargs['tls'].verify is False + parsed_host = parse_host(kwargs['base_url'], IS_WINDOWS_PLATFORM, True) try: client = APIClient(**kwargs) - assert kwargs['base_url'] == client.base_url + assert parsed_host == client.base_url assert kwargs['tls'].cert == client.cert assert not kwargs['tls'].verify except TypeError as e:
