openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
October 2018
- 1 participants
- 1996 discussions
Hello community,
here is the log from the commit of package python-uvloop for openSUSE:Factory checked in at 2018-10-31 13:13:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-uvloop (Old)
and /work/SRC/openSUSE:Factory/.python-uvloop.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-uvloop"
Wed Oct 31 13:13:08 2018 rev:2 rq:644631 version:0.11.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-uvloop/python-uvloop.changes 2018-10-15 10:49:02.183031518 +0200
+++ /work/SRC/openSUSE:Factory/.python-uvloop.new/python-uvloop.changes 2018-10-31 13:13:12.567525314 +0100
@@ -1,0 +2,10 @@
+Thu Oct 25 12:22:16 UTC 2018 - Tomáš Chvátal <tchvatal(a)suse.com>
+
+- Tests are flaky, thus continue even if we fail...
+
+-------------------------------------------------------------------
+Sun Oct 14 09:52:45 UTC 2018 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Ensure neutrality of description.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-uvloop.spec ++++++
--- /var/tmp/diff_new_pack.JSD9iJ/_old 2018-10-31 13:13:13.691524228 +0100
+++ /var/tmp/diff_new_pack.JSD9iJ/_new 2018-10-31 13:13:13.695524224 +0100
@@ -21,7 +21,7 @@
Name: python-uvloop
Version: 0.11.2
Release: 0
-Summary: Fast implementation of asyncio event loop on top of libuv
+Summary: An asyncio event loop on top of libuv
License: MIT AND Apache-2.0
Group: Development/Languages/Python
URL: http://github.com/MagicStack/uvloop
@@ -38,7 +38,7 @@
%python_subpackages
%description
-uvloop is a fast, drop-in replacement of the built-in asyncio
+uvloop is a drop-in replacement of the built-in asyncio
event loop. uvloop is implemented in Cython and uses libuv
under the hood.
@@ -61,7 +61,8 @@
%python_expand %fdupes %{buildroot}%{$python_sitearch}
%check
-python3 setup.py test
+# Actually the tests are VERY flaky, thus continue even if they fail :(
+%python_exec setup.py test || :
%files %{python_files}
%license LICENSE-APACHE LICENSE-MIT
1
0
Hello community,
here is the log from the commit of package python-docker for openSUSE:Factory checked in at 2018-10-31 13:12:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-docker (Old)
and /work/SRC/openSUSE:Factory/.python-docker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-docker"
Wed Oct 31 13:12:32 2018 rev:9 rq:643580 version:3.5.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-docker/python-docker.changes 2018-08-31 10:46:19.187338373 +0200
+++ /work/SRC/openSUSE:Factory/.python-docker.new/python-docker.changes 2018-10-31 13:12:41.463555402 +0100
@@ -1,0 +2,8 @@
+Sat Oct 20 15:33:00 UTC 2018 - Arun Persaud <arun(a)gmx.de>
+
+- update to version 3.5.1:
+ * Bumped version of pyOpenSSL in requirements.txt and setup.py to
+ prevent installation of a vulnerable version
+ * Docs fixes
+
+-------------------------------------------------------------------
@@ -5,0 +14,26 @@
+
+-------------------------------------------------------------------
+Sat Aug 11 16:13:17 UTC 2018 - arun(a)gmx.de
+
+- specfile:
+ * updated requirement python-docker-pycreds to 0.3.0
+
+- update to version 3.5.0:
+ * Deprecation warning
+ + Support for Python 3.3 will be dropped in the 4.0.0 release
+ * Features
+ + Updated dependencies to ensure support for Python 3.7
+ environments
+ + Added support for the uts_mode parameter in HostConfig
+ + The UpdateConfig constructor now allows rollback as a valid
+ value for failure_action
+ + Added support for rollback_config in APIClient.create_service,
+ APIClient.update_service, DockerClient.services.create and
+ Service.update.
+ * Bugfixes
+ + Credential helpers are now properly leveraged by the build
+ method
+ + Fixed a bug that caused placement preferences to be ignored when
+ provided to DockerClient.services.create
+ + Fixed a bug that caused a user value of 0 to be ignored in
+ APIClient.create_container and DockerClient.containers.create
Old:
----
docker-3.4.1.tar.gz
New:
----
docker-3.5.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-docker.spec ++++++
--- /var/tmp/diff_new_pack.Q1lRj4/_old 2018-10-31 13:12:44.803552167 +0100
+++ /var/tmp/diff_new_pack.Q1lRj4/_new 2018-10-31 13:12:44.807552164 +0100
@@ -12,26 +12,21 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define oldpython python
Name: python-docker
-Version: 3.4.1
+Version: 3.5.1
Release: 0
Summary: Docker API Client
License: Apache-2.0
Group: System/Management
URL: https://github.com/docker/docker-py
Source0: https://files.pythonhosted.org/packages/source/d/docker/docker-%{version}.t…
-%if 0%{?suse_version} < 1320
-BuildRequires: %{oldpython}
-BuildRequires: %{python_module backports.ssl_match_hostname >= 3.5}
-BuildRequires: python3
-%endif
-BuildRequires: %{python_module docker-pycreds >= 0.2.3}
+BuildRequires: %{python_module docker-pycreds >= 0.3.0}
BuildRequires: %{python_module mock}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module pytest >= 2.9.1}
@@ -43,7 +38,7 @@
BuildRequires: %{python_module websocket-client >= 0.32.0}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
-Requires: python-docker-pycreds >= 0.2.3
+Requires: python-docker-pycreds >= 0.3.0
Requires: python-requests >= 2.14.2
Requires: python-six >= 1.4.0
Requires: python-websocket-client >= 0.32.0
@@ -51,6 +46,11 @@
Obsoletes: python-docker-py < %{version}
Provides: python-docker-py = %{version}
BuildArch: noarch
+%if 0%{?suse_version} < 1320
+BuildRequires: %{oldpython}
+BuildRequires: %{python_module backports.ssl_match_hostname >= 3.5}
+BuildRequires: python3
+%endif
%ifpython2
Requires: %{oldpython}-backports.ssl_match_hostname >= 3.5
Requires: %{oldpython}-ipaddress >= 1.0.16
@@ -80,8 +80,9 @@
%files %{python_files}
%license LICENSE
%doc README.md
-%dir %{python_sitelib}/*
+%dir %{python_sitelib}/docker
+%dir %{python_sitelib}/docker-%{version}-*.egg-info
%{python_sitelib}/docker/*
-%{python_sitelib}/*egg-info/*
+%{python_sitelib}/docker*egg-info/*
%changelog
++++++ docker-3.4.1.tar.gz -> docker-3.5.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/PKG-INFO new/docker-3.5.1/PKG-INFO
--- old/docker-3.4.1/PKG-INFO 2018-06-29 21:43:11.000000000 +0200
+++ new/docker-3.5.1/PKG-INFO 2018-10-18 00:04:10.000000000 +0200
@@ -1,10 +1,10 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
Name: docker
-Version: 3.4.1
+Version: 3.5.1
Summary: A Python library for the Docker Engine API.
Home-page: https://github.com/docker/docker-py
-Author: Joffrey F
-Author-email: joffrey(a)docker.com
+Maintainer: Joffrey F
+Maintainer-email: joffrey(a)docker.com
License: Apache License 2.0
Description: Docker SDK for Python
=====================
@@ -114,5 +114,7 @@
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
Classifier: Topic :: Utilities
Classifier: License :: OSI Approved :: Apache Software License
+Provides-Extra: tls
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/docker/api/build.py new/docker-3.5.1/docker/api/build.py
--- old/docker-3.4.1/docker/api/build.py 2018-06-29 20:29:12.000000000 +0200
+++ new/docker-3.5.1/docker/api/build.py 2018-08-21 19:56:12.000000000 +0200
@@ -293,20 +293,28 @@
# Send the full auth configuration (if any exists), since the build
# could use any (or all) of the registries.
if self._auth_configs:
+ auth_cfgs = self._auth_configs
auth_data = {}
- if self._auth_configs.get('credsStore'):
+ if auth_cfgs.get('credsStore'):
# Using a credentials store, we need to retrieve the
# credentials for each registry listed in the config.json file
# Matches CLI behavior: https://github.com/docker/docker/blob/
# 67b85f9d26f1b0b2b240f2d794748fac0f45243c/cliconfig/
# credentials/native_store.go#L68-L83
- for registry in self._auth_configs.get('auths', {}).keys():
+ for registry in auth_cfgs.get('auths', {}).keys():
auth_data[registry] = auth.resolve_authconfig(
- self._auth_configs, registry,
+ auth_cfgs, registry,
credstore_env=self.credstore_env,
)
else:
- auth_data = self._auth_configs.get('auths', {}).copy()
+ for registry in auth_cfgs.get('credHelpers', {}).keys():
+ auth_data[registry] = auth.resolve_authconfig(
+ auth_cfgs, registry,
+ credstore_env=self.credstore_env
+ )
+ for registry, creds in auth_cfgs.get('auths', {}).items():
+ if registry not in auth_data:
+ auth_data[registry] = creds
# See https://github.com/docker/docker-py/issues/1683
if auth.INDEX_NAME in auth_data:
auth_data[auth.INDEX_URL] = auth_data[auth.INDEX_NAME]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/docker/api/container.py new/docker-3.5.1/docker/api/container.py
--- old/docker-3.4.1/docker/api/container.py 2018-06-29 21:01:35.000000000 +0200
+++ new/docker-3.5.1/docker/api/container.py 2018-10-18 00:03:50.000000000 +0200
@@ -465,7 +465,7 @@
dns_opt (:py:class:`list`): Additional options to be added to the
container's ``resolv.conf`` file
dns_search (:py:class:`list`): DNS search domains.
- extra_hosts (dict): Addtional hostnames to resolve inside the
+ extra_hosts (dict): Additional hostnames to resolve inside the
container, as a mapping of hostname to IP address.
group_add (:py:class:`list`): List of additional group names and/or
IDs that the container process will run as.
@@ -547,6 +547,8 @@
userns_mode (str): Sets the user namespace mode for the container
when user namespace remapping option is enabled. Supported
values are: ``host``
+ uts_mode (str): Sets the UTS namespace mode for the container.
+ Supported values are: ``host``
volumes_from (:py:class:`list`): List of container names or IDs to
get volumes from.
runtime (str): Runtime to use with this container.
@@ -763,16 +765,16 @@
Args:
container (str): The container to get logs from
- stdout (bool): Get ``STDOUT``
- stderr (bool): Get ``STDERR``
- stream (bool): Stream the response
- timestamps (bool): Show timestamps
+ stdout (bool): Get ``STDOUT``. Default ``True``
+ stderr (bool): Get ``STDERR``. Default ``True``
+ stream (bool): Stream the response. Default ``False``
+ timestamps (bool): Show timestamps. Default ``False``
tail (str or int): Output specified number of lines at the end of
logs. Either an integer of number of lines or the string
``all``. Default ``all``
since (datetime or int): Show logs since a given datetime or
integer epoch (in seconds)
- follow (bool): Follow log output
+ follow (bool): Follow log output. Default ``False``
until (datetime or int): Show logs that occurred before the given
datetime or integer epoch (in seconds)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/docker/api/mixin.py new/docker-3.5.1/docker/api/mixin.py
--- old/docker-3.4.1/docker/api/mixin.py 1970-01-01 01:00:00.000000000 +0100
+++ new/docker-3.5.1/docker/api/mixin.py 2018-08-18 02:47:04.000000000 +0200
@@ -0,0 +1,57 @@
+from typing import Any, Dict, Iterable, List, Optional, Union
+
+import requests
+
+from ..constants import DEFAULT_DOCKER_API_VERSION, DEFAULT_TIMEOUT_SECONDS
+
+class BaseMixin(object):
+ base_url: str = ''
+ credstore_env: Optional[Dict[str, str]] = None
+ timeout: int = DEFAULT_TIMEOUT_SECONDS
+ _auth_configs: Dict[str, Dict]
+ _general_configs: Dict[str, Dict]
+ _version: str = DEFAULT_DOCKER_API_VERSION
+
+ def _url(self, pathfmt: str, *args, **kwargs) -> str:
+ raise NotImplemented
+
+ def _post(self, url: str, **kwargs) -> requests.Response:
+ raise NotImplemented
+
+ def _get(self, url: str, **kwargs) -> requests.Response:
+ raise NotImplemented
+
+ def _put(self, url: str, **kwargs) -> requests.Response:
+ raise NotImplemented
+
+ def _delete(self, url: str, **kwargs) -> requests.Response:
+ raise NotImplemented
+
+ def _post_json(self, url: str, data: Optional[Union[Dict[str, Any], List[Any]]], **kwargs) -> requests.Response:
+ raise NotImplemented
+
+ def _raise_for_status(self, response: requests.Response) -> None:
+ raise NotImplemented
+
+ def _result(self, response: requests.Response, json: bool=False, binary: bool=False) -> Any:
+ raise NotImplemented
+
+ def _stream_helper(self, response: requests.Response, decode: bool = False) -> Iterable:
+ raise NotImplemented
+
+ def _get_raw_response_socket(self, response: requests.Response) -> Iterable:
+ raise NotImplemented
+
+ def _read_from_socket(
+ self,
+ response: requests.Response,
+ stream: bool,
+ tty: bool = False) -> Union[Iterable[bytes], bytes]:
+ raise NotImplemented
+
+ def _stream_raw_result(
+ self,
+ response: requests.Response,
+ chunk_size: int = 1,
+ decode: bool = True) -> Iterable[bytes]:
+ raise NotImplemented
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/docker/api/service.py new/docker-3.5.1/docker/api/service.py
--- old/docker-3.4.1/docker/api/service.py 2018-03-20 09:47:00.000000000 +0100
+++ new/docker-3.5.1/docker/api/service.py 2018-08-21 19:56:12.000000000 +0200
@@ -2,7 +2,8 @@
from ..types import ServiceMode
-def _check_api_features(version, task_template, update_config, endpoint_spec):
+def _check_api_features(version, task_template, update_config, endpoint_spec,
+ rollback_config):
def raise_version_error(param, min_version):
raise errors.InvalidVersion(
@@ -18,10 +19,24 @@
if 'Monitor' in update_config:
raise_version_error('UpdateConfig.monitor', '1.25')
+ if utils.version_lt(version, '1.28'):
+ if update_config.get('FailureAction') == 'rollback':
+ raise_version_error(
+ 'UpdateConfig.failure_action rollback', '1.28'
+ )
+
if utils.version_lt(version, '1.29'):
if 'Order' in update_config:
raise_version_error('UpdateConfig.order', '1.29')
+ if rollback_config is not None:
+ if utils.version_lt(version, '1.28'):
+ raise_version_error('rollback_config', '1.28')
+
+ if utils.version_lt(version, '1.29'):
+ if 'Order' in update_config:
+ raise_version_error('RollbackConfig.order', '1.29')
+
if endpoint_spec is not None:
if utils.version_lt(version, '1.32') and 'Ports' in endpoint_spec:
if any(p.get('PublishMode') for p in endpoint_spec['Ports']):
@@ -99,7 +114,7 @@
def create_service(
self, task_template, name=None, labels=None, mode=None,
update_config=None, networks=None, endpoint_config=None,
- endpoint_spec=None
+ endpoint_spec=None, rollback_config=None
):
"""
Create a service.
@@ -114,6 +129,8 @@
or global). Defaults to replicated.
update_config (UpdateConfig): Specification for the update strategy
of the service. Default: ``None``
+ rollback_config (RollbackConfig): Specification for the rollback
+ strategy of the service. Default: ``None``
networks (:py:class:`list`): List of network names or IDs to attach
the service to. Default: ``None``.
endpoint_spec (EndpointSpec): Properties that can be configured to
@@ -129,7 +146,8 @@
"""
_check_api_features(
- self._version, task_template, update_config, endpoint_spec
+ self._version, task_template, update_config, endpoint_spec,
+ rollback_config
)
url = self._url('/services/create')
@@ -160,6 +178,9 @@
if update_config is not None:
data['UpdateConfig'] = update_config
+ if rollback_config is not None:
+ data['RollbackConfig'] = rollback_config
+
return self._result(
self._post_json(url, data=data, headers=headers), True
)
@@ -336,7 +357,8 @@
def update_service(self, service, version, task_template=None, name=None,
labels=None, mode=None, update_config=None,
networks=None, endpoint_config=None,
- endpoint_spec=None, fetch_current_spec=False):
+ endpoint_spec=None, fetch_current_spec=False,
+ rollback_config=None):
"""
Update a service.
@@ -354,6 +376,8 @@
or global). Defaults to replicated.
update_config (UpdateConfig): Specification for the update strategy
of the service. Default: ``None``.
+ rollback_config (RollbackConfig): Specification for the rollback
+ strategy of the service. Default: ``None``
networks (:py:class:`list`): List of network names or IDs to attach
the service to. Default: ``None``.
endpoint_spec (EndpointSpec): Properties that can be configured to
@@ -370,7 +394,8 @@
"""
_check_api_features(
- self._version, task_template, update_config, endpoint_spec
+ self._version, task_template, update_config, endpoint_spec,
+ rollback_config
)
if fetch_current_spec:
@@ -416,6 +441,11 @@
else:
data['UpdateConfig'] = current.get('UpdateConfig')
+ if rollback_config is not None:
+ data['RollbackConfig'] = rollback_config
+ else:
+ data['RollbackConfig'] = current.get('RollbackConfig')
+
if networks is not None:
converted_networks = utils.convert_service_networks(networks)
if utils.version_lt(self._version, '1.25'):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/docker/models/containers.py new/docker-3.5.1/docker/models/containers.py
--- old/docker-3.4.1/docker/models/containers.py 2018-06-29 20:29:09.000000000 +0200
+++ new/docker-3.5.1/docker/models/containers.py 2018-10-18 00:03:50.000000000 +0200
@@ -253,16 +253,16 @@
generator you can iterate over to retrieve log output as it happens.
Args:
- stdout (bool): Get ``STDOUT``
- stderr (bool): Get ``STDERR``
- stream (bool): Stream the response
- timestamps (bool): Show timestamps
+ stdout (bool): Get ``STDOUT``. Default ``True``
+ stderr (bool): Get ``STDERR``. Default ``True``
+ stream (bool): Stream the response. Default ``False``
+ timestamps (bool): Show timestamps. Default ``False``
tail (str or int): Output specified number of lines at the end of
logs. Either an integer of number of lines or the string
``all``. Default ``all``
since (datetime or int): Show logs since a given datetime or
integer epoch (in seconds)
- follow (bool): Follow log output
+ follow (bool): Follow log output. Default ``False``
until (datetime or int): Show logs that occurred before the given
datetime or integer epoch (in seconds)
@@ -558,7 +558,7 @@
environment (dict or list): Environment variables to set inside
the container, as a dictionary or a list of strings in the
format ``["SOMEVARIABLE=xxx"]``.
- extra_hosts (dict): Addtional hostnames to resolve inside the
+ extra_hosts (dict): Additional hostnames to resolve inside the
container, as a mapping of hostname to IP address.
group_add (:py:class:`list`): List of additional group names and/or
IDs that the container process will run as.
@@ -995,6 +995,7 @@
'tmpfs',
'ulimits',
'userns_mode',
+ 'uts_mode',
'version',
'volumes_from',
'runtime'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/docker/models/images.py new/docker-3.5.1/docker/models/images.py
--- old/docker-3.4.1/docker/models/images.py 2018-04-26 02:56:44.000000000 +0200
+++ new/docker-3.5.1/docker/models/images.py 2018-10-18 00:03:50.000000000 +0200
@@ -64,9 +64,9 @@
Get a tarball of an image. Similar to the ``docker save`` command.
Args:
- chunk_size (int): The number of bytes returned by each iteration
- of the generator. If ``None``, data will be streamed as it is
- received. Default: 2 MB
+ chunk_size (int): The generator will return up to that much data
+ per iteration, but may return less. If ``None``, data will be
+ streamed as it is received. Default: 2 MB
Returns:
(generator): A stream of raw archive data.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/docker/models/services.py new/docker-3.5.1/docker/models/services.py
--- old/docker-3.4.1/docker/models/services.py 2018-06-29 20:29:12.000000000 +0200
+++ new/docker-3.5.1/docker/models/services.py 2018-10-18 00:03:50.000000000 +0200
@@ -1,6 +1,6 @@
import copy
from docker.errors import create_unexpected_kwargs_error, InvalidArgument
-from docker.types import TaskTemplate, ContainerSpec, ServiceMode
+from docker.types import TaskTemplate, ContainerSpec, Placement, ServiceMode
from .resource import Model, Collection
@@ -42,7 +42,7 @@
``label``, and ``desired-state``.
Returns:
- (:py:class:`list`): List of task dictionaries.
+ :py:class:`list`: List of task dictionaries.
Raises:
:py:class:`docker.errors.APIError`
@@ -84,26 +84,27 @@
def logs(self, **kwargs):
"""
- Get log stream for the service.
- Note: This method works only for services with the ``json-file``
- or ``journald`` logging drivers.
-
- Args:
- details (bool): Show extra details provided to logs.
- Default: ``False``
- follow (bool): Keep connection open to read logs as they are
- sent by the Engine. Default: ``False``
- stdout (bool): Return logs from ``stdout``. Default: ``False``
- stderr (bool): Return logs from ``stderr``. Default: ``False``
- since (int): UNIX timestamp for the logs staring point.
- Default: 0
- timestamps (bool): Add timestamps to every log line.
- tail (string or int): Number of log lines to be returned,
- counting from the current end of the logs. Specify an
- integer or ``'all'`` to output all log lines.
- Default: ``all``
+ Get log stream for the service.
+ Note: This method works only for services with the ``json-file``
+ or ``journald`` logging drivers.
- Returns (generator): Logs for the service.
+ Args:
+ details (bool): Show extra details provided to logs.
+ Default: ``False``
+ follow (bool): Keep connection open to read logs as they are
+ sent by the Engine. Default: ``False``
+ stdout (bool): Return logs from ``stdout``. Default: ``False``
+ stderr (bool): Return logs from ``stderr``. Default: ``False``
+ since (int): UNIX timestamp for the logs staring point.
+ Default: 0
+ timestamps (bool): Add timestamps to every log line.
+ tail (string or int): Number of log lines to be returned,
+ counting from the current end of the logs. Specify an
+ integer or ``'all'`` to output all log lines.
+ Default: ``all``
+
+ Returns:
+ generator: Logs for the service.
"""
is_tty = self.attrs['Spec']['TaskTemplate']['ContainerSpec'].get(
'TTY', False
@@ -118,7 +119,7 @@
replicas (int): The number of containers that should be running.
Returns:
- ``True``if successful.
+ bool: ``True`` if successful.
"""
if 'Global' in self.attrs['Spec']['Mode'].keys():
@@ -134,7 +135,7 @@
Force update the service even if no changes require it.
Returns:
- ``True``if successful.
+ bool: ``True`` if successful.
"""
return self.update(force_update=True, fetch_current_spec=True)
@@ -153,6 +154,9 @@
command (list of str or str): Command to run.
args (list of str): Arguments to the command.
constraints (list of str): Placement constraints.
+ preferences (list of str): Placement preferences.
+ platforms (list of tuple): A list of platforms constraints
+ expressed as ``(arch, os)`` tuples
container_labels (dict): Labels to apply to the container.
endpoint_spec (EndpointSpec): Properties that can be configured to
access and load balance a service. Default: ``None``.
@@ -180,6 +184,8 @@
containers to terminate before forcefully killing them.
update_config (UpdateConfig): Specification for the update strategy
of the service. Default: ``None``
+ rollback_config (RollbackConfig): Specification for the rollback
+ strategy of the service. Default: ``None``
user (str): User to run commands as.
workdir (str): Working directory for commands to run.
tty (boolean): Whether a pseudo-TTY should be allocated.
@@ -201,7 +207,7 @@
containers.
Returns:
- (:py:class:`Service`) The created service.
+ :py:class:`Service`: The created service.
Raises:
:py:class:`docker.errors.APIError`
@@ -223,7 +229,7 @@
into the output.
Returns:
- (:py:class:`Service`): The service.
+ :py:class:`Service`: The service.
Raises:
:py:class:`docker.errors.NotFound`
@@ -248,7 +254,7 @@
Default: ``None``.
Returns:
- (list of :py:class:`Service`): The services.
+ list of :py:class:`Service`: The services.
Raises:
:py:class:`docker.errors.APIError`
@@ -302,6 +308,12 @@
'endpoint_spec',
]
+PLACEMENT_KWARGS = [
+ 'constraints',
+ 'preferences',
+ 'platforms',
+]
+
def _get_create_service_kwargs(func_name, kwargs):
# Copy over things which can be copied directly
@@ -321,10 +333,12 @@
if 'container_labels' in kwargs:
container_spec_kwargs['labels'] = kwargs.pop('container_labels')
- if 'constraints' in kwargs:
- task_template_kwargs['placement'] = {
- 'Constraints': kwargs.pop('constraints')
- }
+ placement = {}
+ for key in copy.copy(kwargs):
+ if key in PLACEMENT_KWARGS:
+ placement[key] = kwargs.pop(key)
+ placement = Placement(**placement)
+ task_template_kwargs['placement'] = placement
if 'log_driver' in kwargs:
task_template_kwargs['log_driver'] = {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/docker/types/__init__.py new/docker-3.5.1/docker/types/__init__.py
--- old/docker-3.4.1/docker/types/__init__.py 2018-03-30 01:25:27.000000000 +0200
+++ new/docker-3.5.1/docker/types/__init__.py 2018-08-10 02:24:32.000000000 +0200
@@ -5,7 +5,7 @@
from .networks import EndpointConfig, IPAMConfig, IPAMPool, NetworkingConfig
from .services import (
ConfigReference, ContainerSpec, DNSConfig, DriverConfig, EndpointSpec,
- Mount, Placement, Privileges, Resources, RestartPolicy, SecretReference,
- ServiceMode, TaskTemplate, UpdateConfig
+ Mount, Placement, Privileges, Resources, RestartPolicy, RollbackConfig,
+ SecretReference, ServiceMode, TaskTemplate, UpdateConfig
)
from .swarm import SwarmSpec, SwarmExternalCA
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/docker/types/containers.py new/docker-3.5.1/docker/types/containers.py
--- old/docker-3.4.1/docker/types/containers.py 2018-06-29 20:29:09.000000000 +0200
+++ new/docker-3.5.1/docker/types/containers.py 2018-08-10 02:24:32.000000000 +0200
@@ -115,11 +115,11 @@
device_read_iops=None, device_write_iops=None,
oom_kill_disable=False, shm_size=None, sysctls=None,
tmpfs=None, oom_score_adj=None, dns_opt=None, cpu_shares=None,
- cpuset_cpus=None, userns_mode=None, pids_limit=None,
- isolation=None, auto_remove=False, storage_opt=None,
- init=None, init_path=None, volume_driver=None,
- cpu_count=None, cpu_percent=None, nano_cpus=None,
- cpuset_mems=None, runtime=None, mounts=None,
+ cpuset_cpus=None, userns_mode=None, uts_mode=None,
+ pids_limit=None, isolation=None, auto_remove=False,
+ storage_opt=None, init=None, init_path=None,
+ volume_driver=None, cpu_count=None, cpu_percent=None,
+ nano_cpus=None, cpuset_mems=None, runtime=None, mounts=None,
cpu_rt_period=None, cpu_rt_runtime=None,
device_cgroup_rules=None):
@@ -392,6 +392,11 @@
raise host_config_value_error("userns_mode", userns_mode)
self['UsernsMode'] = userns_mode
+ if uts_mode:
+ if uts_mode != "host":
+ raise host_config_value_error("uts_mode", uts_mode)
+ self['UTSMode'] = uts_mode
+
if pids_limit:
if not isinstance(pids_limit, int):
raise host_config_type_error('pids_limit', pids_limit, 'int')
@@ -573,7 +578,7 @@
'Hostname': hostname,
'Domainname': domainname,
'ExposedPorts': ports,
- 'User': six.text_type(user) if user else None,
+ 'User': six.text_type(user) if user is not None else None,
'Tty': tty,
'OpenStdin': stdin_open,
'StdinOnce': stdin_once,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/docker/types/services.py new/docker-3.5.1/docker/types/services.py
--- old/docker-3.4.1/docker/types/services.py 2018-06-29 20:29:12.000000000 +0200
+++ new/docker-3.5.1/docker/types/services.py 2018-08-10 02:24:32.000000000 +0200
@@ -368,10 +368,11 @@
parallelism (int): Maximum number of tasks to be updated in one
iteration (0 means unlimited parallelism). Default: 0.
- delay (int): Amount of time between updates.
+ delay (int): Amount of time between updates, in nanoseconds.
failure_action (string): Action to take if an updated task fails to
run, or stops running during the update. Acceptable values are
- ``continue`` and ``pause``. Default: ``continue``
+ ``continue``, ``pause``, as well as ``rollback`` since API v1.28.
+ Default: ``continue``
monitor (int): Amount of time to monitor each updated task for
failures, in nanoseconds.
max_failure_ratio (float): The fraction of tasks that may fail during
@@ -385,9 +386,9 @@
self['Parallelism'] = parallelism
if delay is not None:
self['Delay'] = delay
- if failure_action not in ('pause', 'continue'):
+ if failure_action not in ('pause', 'continue', 'rollback'):
raise errors.InvalidArgument(
- 'failure_action must be either `pause` or `continue`.'
+ 'failure_action must be one of `pause`, `continue`, `rollback`'
)
self['FailureAction'] = failure_action
@@ -413,6 +414,30 @@
self['Order'] = order
+class RollbackConfig(UpdateConfig):
+ """
+ Used to specify the way containe rollbacks should be performed by a service
+
+ Args:
+ parallelism (int): Maximum number of tasks to be rolled back in one
+ iteration (0 means unlimited parallelism). Default: 0
+ delay (int): Amount of time between rollbacks, in nanoseconds.
+ failure_action (string): Action to take if a rolled back task fails to
+ run, or stops running during the rollback. Acceptable values are
+ ``continue``, ``pause`` or ``rollback``.
+ Default: ``continue``
+ monitor (int): Amount of time to monitor each rolled back task for
+ failures, in nanoseconds.
+ max_failure_ratio (float): The fraction of tasks that may fail during
+ a rollback before the failure action is invoked, specified as a
+ floating point number between 0 and 1. Default: 0
+ order (string): Specifies the order of operations when rolling out a
+ rolled back task. Either ``start_first`` or ``stop_first`` are
+ accepted.
+ """
+ pass
+
+
class RestartConditionTypesEnum(object):
_values = (
'none',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/docker/version.py new/docker-3.5.1/docker/version.py
--- old/docker-3.4.1/docker/version.py 2018-06-29 21:01:35.000000000 +0200
+++ new/docker-3.5.1/docker/version.py 2018-10-18 00:03:50.000000000 +0200
@@ -1,2 +1,2 @@
-version = "3.4.1"
+version = "3.5.1"
version_info = tuple([int(d) for d in version.split("-")[0].split(".")])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/docker.egg-info/PKG-INFO new/docker-3.5.1/docker.egg-info/PKG-INFO
--- old/docker-3.4.1/docker.egg-info/PKG-INFO 2018-06-29 21:43:11.000000000 +0200
+++ new/docker-3.5.1/docker.egg-info/PKG-INFO 2018-10-18 00:04:10.000000000 +0200
@@ -1,10 +1,10 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
Name: docker
-Version: 3.4.1
+Version: 3.5.1
Summary: A Python library for the Docker Engine API.
Home-page: https://github.com/docker/docker-py
-Author: Joffrey F
-Author-email: joffrey(a)docker.com
+Maintainer: Joffrey F
+Maintainer-email: joffrey(a)docker.com
License: Apache License 2.0
Description: Docker SDK for Python
=====================
@@ -114,5 +114,7 @@
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
Classifier: Topic :: Utilities
Classifier: License :: OSI Approved :: Apache Software License
+Provides-Extra: tls
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/docker.egg-info/SOURCES.txt new/docker-3.5.1/docker.egg-info/SOURCES.txt
--- old/docker-3.4.1/docker.egg-info/SOURCES.txt 2018-06-29 21:43:11.000000000 +0200
+++ new/docker-3.5.1/docker.egg-info/SOURCES.txt 2018-10-18 00:04:10.000000000 +0200
@@ -17,6 +17,7 @@
docker.egg-info/SOURCES.txt
docker.egg-info/dependency_links.txt
docker.egg-info/not-zip-safe
+docker.egg-info/pbr.json
docker.egg-info/requires.txt
docker.egg-info/top_level.txt
docker/api/__init__.py
@@ -27,6 +28,7 @@
docker/api/daemon.py
docker/api/exec_api.py
docker/api/image.py
+docker/api/mixin.py
docker/api/network.py
docker/api/plugin.py
docker/api/secret.py
@@ -120,6 +122,7 @@
tests/unit/models_services_test.py
tests/unit/ssladapter_test.py
tests/unit/swarm_test.py
+tests/unit/types_containers_test.py
tests/unit/utils_build_test.py
tests/unit/utils_config_test.py
tests/unit/utils_json_stream_test.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/docker.egg-info/pbr.json new/docker-3.5.1/docker.egg-info/pbr.json
--- old/docker-3.4.1/docker.egg-info/pbr.json 1970-01-01 01:00:00.000000000 +0100
+++ new/docker-3.5.1/docker.egg-info/pbr.json 2018-09-26 22:40:27.000000000 +0200
@@ -0,0 +1 @@
+{"is_release": false, "git_version": "2b10c37"}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/docker.egg-info/requires.txt new/docker-3.5.1/docker.egg-info/requires.txt
--- old/docker-3.4.1/docker.egg-info/requires.txt 2018-06-29 21:43:11.000000000 +0200
+++ new/docker-3.5.1/docker.egg-info/requires.txt 2018-10-18 00:04:10.000000000 +0200
@@ -1,7 +1,7 @@
-requests!=2.18.0,>=2.14.2
six>=1.4.0
websocket-client>=0.32.0
docker-pycreds>=0.3.0
+requests!=2.18.0,>=2.14.2
[:python_version < "3.3"]
ipaddress>=1.0.16
@@ -9,13 +9,16 @@
[:python_version < "3.5"]
backports.ssl_match_hostname>=3.5
+[:python_version == "3.3"]
+urllib3<1.23
+
[:sys_platform == "win32" and python_version < "3.6"]
pypiwin32==219
[:sys_platform == "win32" and python_version >= "3.6"]
-pypiwin32==220
+pypiwin32==223
[tls]
-pyOpenSSL>=0.14
+pyOpenSSL>=17.5.0
cryptography>=1.3.4
idna>=2.0.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/requirements.txt new/docker-3.5.1/requirements.txt
--- old/docker-3.4.1/requirements.txt 2018-06-29 20:29:12.000000000 +0200
+++ new/docker-3.5.1/requirements.txt 2018-10-18 00:03:51.000000000 +0200
@@ -2,17 +2,19 @@
asn1crypto==0.22.0
backports.ssl-match-hostname==3.5.0.1
cffi==1.10.0
-cryptography==1.9
+cryptography==1.9; python_version == '3.3'
+cryptography==2.3; python_version > '3.3'
docker-pycreds==0.3.0
enum34==1.1.6
idna==2.5
ipaddress==1.0.18
packaging==16.8
pycparser==2.17
-pyOpenSSL==17.0.0
+pyOpenSSL==18.0.0
pyparsing==2.2.0
pypiwin32==219; sys_platform == 'win32' and python_version < '3.6'
-pypiwin32==220; sys_platform == 'win32' and python_version >= '3.6'
+pypiwin32==223; sys_platform == 'win32' and python_version >= '3.6'
requests==2.14.2
six==1.10.0
websocket-client==0.40.0
+urllib3==1.21.1; python_version == '3.3'
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/setup.py new/docker-3.5.1/setup.py
--- old/docker-3.4.1/setup.py 2018-06-29 20:29:12.000000000 +0200
+++ new/docker-3.5.1/setup.py 2018-10-18 00:03:51.000000000 +0200
@@ -10,10 +10,10 @@
SOURCE_DIR = os.path.join(ROOT_DIR)
requirements = [
- 'requests >= 2.14.2, != 2.18.0',
'six >= 1.4.0',
'websocket-client >= 0.32.0',
- 'docker-pycreds >= 0.3.0'
+ 'docker-pycreds >= 0.3.0',
+ 'requests >= 2.14.2, != 2.18.0',
]
extras_require = {
@@ -27,7 +27,10 @@
# Python 3.6 is only compatible with v220 ; Python < 3.5 is not supported
# on v220 ; ALL versions are broken for v222 (as of 2018-01-26)
':sys_platform == "win32" and python_version < "3.6"': 'pypiwin32==219',
- ':sys_platform == "win32" and python_version >= "3.6"': 'pypiwin32==220',
+ ':sys_platform == "win32" and python_version >= "3.6"': 'pypiwin32==223',
+
+ # urllib3 drops support for Python 3.3 in 1.23
+ ':python_version == "3.3"': 'urllib3 < 1.23',
# If using docker-py over TLS, highly recommend this option is
# pip-installed or pinned.
@@ -37,7 +40,8 @@
# https://github.com/pypa/pip/issues/4391) Once that's fixed, instead of
# installing the extra dependencies, install the following instead:
# 'requests[security] >= 2.5.2, != 2.11.0, != 2.12.2'
- 'tls': ['pyOpenSSL>=0.14', 'cryptography>=1.3.4', 'idna>=2.0.0'],
+ 'tls': ['pyOpenSSL>=17.5.0', 'cryptography>=1.3.4', 'idna>=2.0.0'],
+
}
version = None
@@ -81,6 +85,7 @@
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
'Topic :: Utilities',
'License :: OSI Approved :: Apache Software License',
],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/test-requirements.txt new/docker-3.5.1/test-requirements.txt
--- old/docker-3.4.1/test-requirements.txt 2018-03-30 01:25:27.000000000 +0200
+++ new/docker-3.5.1/test-requirements.txt 2018-08-10 02:24:32.000000000 +0200
@@ -1,6 +1,7 @@
coverage==3.7.1
flake8==3.4.1
mock==1.0.1
-pytest==2.9.1
+pytest==2.9.1; python_version == '3.3'
+pytest==3.6.3; python_version > '3.3'
pytest-cov==2.1.0
pytest-timeout==1.2.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/tests/integration/api_container_test.py new/docker-3.5.1/tests/integration/api_container_test.py
--- old/docker-3.4.1/tests/integration/api_container_test.py 2018-06-29 20:29:12.000000000 +0200
+++ new/docker-3.5.1/tests/integration/api_container_test.py 2018-08-10 02:24:32.000000000 +0200
@@ -490,6 +490,16 @@
self.client.start(ctnr)
assert rule in self.client.logs(ctnr).decode('utf-8')
+ def test_create_with_uts_mode(self):
+ container = self.client.create_container(
+ BUSYBOX, ['echo'], host_config=self.client.create_host_config(
+ uts_mode='host'
+ )
+ )
+ self.tmp_containers.append(container)
+ config = self.client.inspect_container(container)
+ assert config['HostConfig']['UTSMode'] == 'host'
+
@pytest.mark.xfail(
IS_WINDOWS_PLATFORM, reason='Test not designed for Windows platform'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/tests/integration/api_service_test.py new/docker-3.5.1/tests/integration/api_service_test.py
--- old/docker-3.4.1/tests/integration/api_service_test.py 2018-03-20 09:47:00.000000000 +0100
+++ new/docker-3.5.1/tests/integration/api_service_test.py 2018-08-10 02:24:32.000000000 +0200
@@ -281,6 +281,20 @@
assert update_config['Delay'] == uc['Delay']
assert update_config['FailureAction'] == uc['FailureAction']
+ @requires_api_version('1.28')
+ def test_create_service_with_failure_action_rollback(self):
+ container_spec = docker.types.ContainerSpec(BUSYBOX, ['true'])
+ task_tmpl = docker.types.TaskTemplate(container_spec)
+ update_config = docker.types.UpdateConfig(failure_action='rollback')
+ name = self.get_service_name()
+ svc_id = self.client.create_service(
+ task_tmpl, update_config=update_config, name=name
+ )
+ svc_info = self.client.inspect_service(svc_id)
+ assert 'UpdateConfig' in svc_info['Spec']
+ uc = svc_info['Spec']['UpdateConfig']
+ assert update_config['FailureAction'] == uc['FailureAction']
+
@requires_api_version('1.25')
def test_create_service_with_update_config_monitor(self):
container_spec = docker.types.ContainerSpec('busybox', ['true'])
@@ -298,6 +312,27 @@
assert update_config['Monitor'] == uc['Monitor']
assert update_config['MaxFailureRatio'] == uc['MaxFailureRatio']
+ @requires_api_version('1.28')
+ def test_create_service_with_rollback_config(self):
+ container_spec = docker.types.ContainerSpec(BUSYBOX, ['true'])
+ task_tmpl = docker.types.TaskTemplate(container_spec)
+ rollback_cfg = docker.types.RollbackConfig(
+ parallelism=10, delay=5, failure_action='pause',
+ monitor=300000000, max_failure_ratio=0.4
+ )
+ name = self.get_service_name()
+ svc_id = self.client.create_service(
+ task_tmpl, rollback_config=rollback_cfg, name=name
+ )
+ svc_info = self.client.inspect_service(svc_id)
+ assert 'RollbackConfig' in svc_info['Spec']
+ rc = svc_info['Spec']['RollbackConfig']
+ assert rollback_cfg['Parallelism'] == rc['Parallelism']
+ assert rollback_cfg['Delay'] == rc['Delay']
+ assert rollback_cfg['FailureAction'] == rc['FailureAction']
+ assert rollback_cfg['Monitor'] == rc['Monitor']
+ assert rollback_cfg['MaxFailureRatio'] == rc['MaxFailureRatio']
+
def test_create_service_with_restart_policy(self):
container_spec = docker.types.ContainerSpec(BUSYBOX, ['true'])
policy = docker.types.RestartPolicy(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/tests/unit/dockertypes_test.py new/docker-3.5.1/tests/unit/dockertypes_test.py
--- old/docker-3.4.1/tests/unit/dockertypes_test.py 2018-06-29 20:29:09.000000000 +0200
+++ new/docker-3.5.1/tests/unit/dockertypes_test.py 2018-08-10 02:24:32.000000000 +0200
@@ -85,6 +85,12 @@
with pytest.raises(ValueError):
create_host_config(version='1.23', userns_mode='host12')
+ def test_create_host_config_with_uts(self):
+ config = create_host_config(version='1.15', uts_mode='host')
+ assert config.get('UTSMode') == 'host'
+ with pytest.raises(ValueError):
+ create_host_config(version='1.15', uts_mode='host12')
+
def test_create_host_config_with_oom_score_adj(self):
config = create_host_config(version='1.22', oom_score_adj=100)
assert config.get('OomScoreAdj') == 100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/tests/unit/models_containers_test.py new/docker-3.5.1/tests/unit/models_containers_test.py
--- old/docker-3.4.1/tests/unit/models_containers_test.py 2018-06-29 20:29:09.000000000 +0200
+++ new/docker-3.5.1/tests/unit/models_containers_test.py 2018-08-10 02:24:32.000000000 +0200
@@ -95,6 +95,7 @@
ulimits=[{"Name": "nofile", "Soft": 1024, "Hard": 2048}],
user='bob',
userns_mode='host',
+ uts_mode='host',
version='1.23',
volume_driver='some_driver',
volumes=[
@@ -174,6 +175,7 @@
'Tmpfs': {'/blah': ''},
'Ulimits': [{"Name": "nofile", "Soft": 1024, "Hard": 2048}],
'UsernsMode': 'host',
+ 'UTSMode': 'host',
'VolumesFrom': ['container'],
},
healthcheck={'test': 'true'},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/tests/unit/models_services_test.py new/docker-3.5.1/tests/unit/models_services_test.py
--- old/docker-3.4.1/tests/unit/models_services_test.py 2018-02-01 03:21:26.000000000 +0100
+++ new/docker-3.5.1/tests/unit/models_services_test.py 2018-08-10 02:24:32.000000000 +0200
@@ -26,6 +26,8 @@
'mounts': [{'some': 'mounts'}],
'stop_grace_period': 5,
'constraints': ['foo=bar'],
+ 'preferences': ['bar=baz'],
+ 'platforms': [('x86_64', 'linux')],
})
task_template = kwargs.pop('task_template')
@@ -41,7 +43,11 @@
'ContainerSpec', 'Resources', 'RestartPolicy', 'Placement',
'LogDriver', 'Networks'
])
- assert task_template['Placement'] == {'Constraints': ['foo=bar']}
+ assert task_template['Placement'] == {
+ 'Constraints': ['foo=bar'],
+ 'Preferences': ['bar=baz'],
+ 'Platforms': [{'Architecture': 'x86_64', 'OS': 'linux'}],
+ }
assert task_template['LogDriver'] == {
'Name': 'logdriver',
'Options': {'foo': 'bar'}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/docker-3.4.1/tests/unit/types_containers_test.py new/docker-3.5.1/tests/unit/types_containers_test.py
--- old/docker-3.4.1/tests/unit/types_containers_test.py 1970-01-01 01:00:00.000000000 +0100
+++ new/docker-3.5.1/tests/unit/types_containers_test.py 2018-08-10 02:24:32.000000000 +0200
@@ -0,0 +1,6 @@
+from docker.types.containers import ContainerConfig
+
+
+def test_uid_0_is_not_elided():
+ x = ContainerConfig(image='i', version='v', command='true', user=0)
+ assert x['User'] == '0'
1
0
Hello community,
here is the log from the commit of package python-tqdm for openSUSE:Factory checked in at 2018-10-31 13:12:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-tqdm (Old)
and /work/SRC/openSUSE:Factory/.python-tqdm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-tqdm"
Wed Oct 31 13:12:21 2018 rev:15 rq:643577 version:4.27.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-tqdm/python-tqdm.changes 2018-09-18 11:44:15.495859113 +0200
+++ /work/SRC/openSUSE:Factory/.python-tqdm.new/python-tqdm.changes 2018-10-31 13:12:27.347569085 +0100
@@ -1,0 +2,15 @@
+Wed Oct 17 15:33:30 UTC 2018 - Arun Persaud <arun(a)gmx.de>
+
+- update to version 4.27.0:
+ * fix str.isnumeric #605
+ * fix WeakSet KeyError #548, #553, #596 -> #607
+ * stop tqdm_notebook description truncation #582 -> #599
+ * include unit_scale for rate #608
+ * add auto -> nowarning autonotebook
+ * add better postfix numeric formatting #621
+ * minor refactoring #609 -> #616
+ * update documentation
+ * add unit tests
+ * fix py26 CI
+
+-------------------------------------------------------------------
Old:
----
tqdm-4.26.0.tar.gz
New:
----
tqdm-4.27.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-tqdm.spec ++++++
--- /var/tmp/diff_new_pack.6gyFg0/_old 2018-10-31 13:12:31.095565451 +0100
+++ /var/tmp/diff_new_pack.6gyFg0/_new 2018-10-31 13:12:31.103565443 +0100
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define oldpython python
Name: python-tqdm
-Version: 4.26.0
+Version: 4.27.0
Release: 0
Summary: An extensible progress meter
License: MPL-2.0 AND MIT
++++++ tqdm-4.26.0.tar.gz -> tqdm-4.27.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tqdm-4.26.0/PKG-INFO new/tqdm-4.27.0/PKG-INFO
--- old/tqdm-4.26.0/PKG-INFO 2018-09-11 21:28:07.000000000 +0200
+++ new/tqdm-4.27.0/PKG-INFO 2018-10-15 18:32:17.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: tqdm
-Version: 4.26.0
+Version: 4.27.0
Summary: Fast, Extensible Progress Meter
Home-page: https://github.com/tqdm/tqdm
Author: Noam Yorav-Raphael
@@ -276,7 +276,7 @@
maxinterval=10.0, miniters=None, ascii=None, disable=False,
unit='it', unit_scale=False, dynamic_ncols=False,
smoothing=0.3, bar_format=None, initial=0, position=None,
- postfix=None):
+ postfix=None, unit_divisor=1000):
Parameters
~~~~~~~~~~
@@ -287,7 +287,7 @@
* desc : str, optional
Prefix for the progressbar.
* total : int, optional
- The number of expected iterations. If (default: None),
+ The number of expected iterations. If unspecified,
len(iterable) is used if possible. As a last resort, only basic
progress statistics are displayed (no ETA, no progressbar).
If ``gui`` is True and this parameter needs subsequent updating,
@@ -307,9 +307,9 @@
fallback is a meter width of 10 and no limit for the counter and
statistics. If 0, will not print any meter (only stats).
* mininterval : float, optional
- Minimum progress display update interval, in seconds [default: 0.1].
+ Minimum progress display update interval [default: 0.1] seconds.
* maxinterval : float, optional
- Maximum progress display update interval, in seconds [default: 10].
+ Maximum progress display update interval [default: 10] seconds.
Automatically adjusts ``miniters`` to correspond to ``mininterval``
after long display update lag. Only works if ``dynamic_miniters``
or monitor thread is enabled.
@@ -326,7 +326,7 @@
the meter. The fallback is to use ASCII characters ``1-9 #``.
* disable : bool, optional
Whether to disable the entire progressbar wrapper
- [default: False].
+ [default: False]. If set to None, disable on non-TTY.
* unit : str, optional
String that will be used to define the unit of each iteration
[default: it].
@@ -348,10 +348,10 @@
[default: '{l_bar}{bar}{r_bar}'], where
l_bar='{desc}: {percentage:3.0f}%|' and
r_bar='| {n_fmt}/{total_fmt} [{elapsed}<{remaining}, '
- '{rate_fmt}{postfix}]'
+ '{rate_fmt}{postfix}]'
Possible vars: l_bar, bar, r_bar, n, n_fmt, total, total_fmt,
- percentage, rate, rate_fmt, rate_noinv, rate_noinv_fmt,
- rate_inv, rate_inv_fmt, elapsed, remaining, desc, postfix.
+ percentage, rate, rate_fmt, rate_noinv, rate_noinv_fmt,
+ rate_inv, rate_inv_fmt, elapsed, remaining, desc, postfix.
Note that a trailing ": " is automatically removed after {desc}
if the latter is empty.
* initial : int, optional
@@ -685,7 +685,8 @@
Note that this will issue a ``TqdmExperimentalWarning`` if run in a notebook
since it is not meant to be possible to distinguish between ``jupyter notebook``
- and ``jupyter console``.
+ and ``jupyter console``. Use ``auto`` instead of ``autonotebook`` to suppress
+ this warning.
Writing messages
~~~~~~~~~~~~~~~~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tqdm-4.26.0/README.rst new/tqdm-4.27.0/README.rst
--- old/tqdm-4.26.0/README.rst 2018-09-11 21:25:42.000000000 +0200
+++ new/tqdm-4.27.0/README.rst 2018-10-15 18:09:30.000000000 +0200
@@ -266,7 +266,7 @@
maxinterval=10.0, miniters=None, ascii=None, disable=False,
unit='it', unit_scale=False, dynamic_ncols=False,
smoothing=0.3, bar_format=None, initial=0, position=None,
- postfix=None):
+ postfix=None, unit_divisor=1000):
Parameters
~~~~~~~~~~
@@ -277,7 +277,7 @@
* desc : str, optional
Prefix for the progressbar.
* total : int, optional
- The number of expected iterations. If (default: None),
+ The number of expected iterations. If unspecified,
len(iterable) is used if possible. As a last resort, only basic
progress statistics are displayed (no ETA, no progressbar).
If ``gui`` is True and this parameter needs subsequent updating,
@@ -297,9 +297,9 @@
fallback is a meter width of 10 and no limit for the counter and
statistics. If 0, will not print any meter (only stats).
* mininterval : float, optional
- Minimum progress display update interval, in seconds [default: 0.1].
+ Minimum progress display update interval [default: 0.1] seconds.
* maxinterval : float, optional
- Maximum progress display update interval, in seconds [default: 10].
+ Maximum progress display update interval [default: 10] seconds.
Automatically adjusts ``miniters`` to correspond to ``mininterval``
after long display update lag. Only works if ``dynamic_miniters``
or monitor thread is enabled.
@@ -316,7 +316,7 @@
the meter. The fallback is to use ASCII characters ``1-9 #``.
* disable : bool, optional
Whether to disable the entire progressbar wrapper
- [default: False].
+ [default: False]. If set to None, disable on non-TTY.
* unit : str, optional
String that will be used to define the unit of each iteration
[default: it].
@@ -338,10 +338,10 @@
[default: '{l_bar}{bar}{r_bar}'], where
l_bar='{desc}: {percentage:3.0f}%|' and
r_bar='| {n_fmt}/{total_fmt} [{elapsed}<{remaining}, '
- '{rate_fmt}{postfix}]'
+ '{rate_fmt}{postfix}]'
Possible vars: l_bar, bar, r_bar, n, n_fmt, total, total_fmt,
- percentage, rate, rate_fmt, rate_noinv, rate_noinv_fmt,
- rate_inv, rate_inv_fmt, elapsed, remaining, desc, postfix.
+ percentage, rate, rate_fmt, rate_noinv, rate_noinv_fmt,
+ rate_inv, rate_inv_fmt, elapsed, remaining, desc, postfix.
Note that a trailing ": " is automatically removed after {desc}
if the latter is empty.
* initial : int, optional
@@ -675,7 +675,8 @@
Note that this will issue a ``TqdmExperimentalWarning`` if run in a notebook
since it is not meant to be possible to distinguish between ``jupyter notebook``
-and ``jupyter console``.
+and ``jupyter console``. Use ``auto`` instead of ``autonotebook`` to suppress
+this warning.
Writing messages
~~~~~~~~~~~~~~~~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tqdm-4.26.0/tox.ini new/tqdm-4.27.0/tox.ini
--- old/tqdm-4.26.0/tox.ini 2018-09-11 21:25:42.000000000 +0200
+++ new/tqdm-4.27.0/tox.ini 2018-10-15 18:09:30.000000000 +0200
@@ -43,7 +43,11 @@
[testenv:py26]
# no codecov and timer for py26
-deps = {[coverage]deps}
+deps =
+ nose
+ coverage
+ coveralls==1.2.0
+ pycparser==2.18
commands = {[coverage]commands}
[testenv:pypy]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tqdm-4.26.0/tqdm/_tqdm.py new/tqdm-4.27.0/tqdm/_tqdm.py
--- old/tqdm-4.26.0/tqdm/_tqdm.py 2018-09-11 21:26:06.000000000 +0200
+++ new/tqdm-4.27.0/tqdm/_tqdm.py 2018-10-15 18:09:30.000000000 +0200
@@ -173,6 +173,44 @@
return '{0:02d}:{1:02d}'.format(m, s)
@staticmethod
+ def format_num(n):
+ """
+ Intelligent scientific notation (.3g).
+
+ Parameters
+ ----------
+ n : int or float or Numeric
+ A Number.
+
+ Returns
+ -------
+ out : str
+ Formatted number.
+ """
+ f = '{0:.3g}'.format(n).replace('+0', '+').replace('-0', '-')
+ n = str(n)
+ return f if len(f) < len(n) else n
+
+ @staticmethod
+ def ema(x, mu=None, alpha=0.3):
+ """
+ Exponential moving average: smoothing to give progressively lower
+ weights to older values.
+
+ Parameters
+ ----------
+ x : float
+ New value to include in EMA.
+ mu : float, optional
+ Previous EMA value.
+ alpha : float, optional
+ Smoothing factor in range [0, 1], [default: 0.3].
+ Increase to give more weight to recent values.
+ Ranges from 0 (yields mu) to 1 (yields x).
+ """
+ return x if mu is None else (alpha * x) + (1 - alpha) * mu
+
+ @staticmethod
def status_printer(file):
"""
Manage the printing and in-place updating of a line of characters.
@@ -267,6 +305,8 @@
if unit_scale and unit_scale not in (True, 1):
total *= unit_scale
n *= unit_scale
+ if rate:
+ rate *= unit_scale # by default rate = 1 / self.avg_time
unit_scale = False
format_interval = tqdm.format_interval
@@ -440,9 +480,11 @@
try:
cls._instances.remove(instance)
except KeyError:
- if not instance.gui: # pragma: no cover
- raise
- else:
+ # if not instance.gui: # pragma: no cover
+ # raise
+ pass # py2: maybe magically removed already
+ # else:
+ if not instance.gui:
for inst in cls._instances:
# negative `pos` means fixed
if inst.pos > abs(instance.pos):
@@ -679,9 +721,9 @@
fallback is a meter width of 10 and no limit for the counter and
statistics. If 0, will not print any meter (only stats).
mininterval : float, optional
- Minimum progress display update interval, in seconds [default: 0.1].
+ Minimum progress display update interval [default: 0.1] seconds.
maxinterval : float, optional
- Maximum progress display update interval, in seconds [default: 10].
+ Maximum progress display update interval [default: 10] seconds.
Automatically adjusts `miniters` to correspond to `mininterval`
after long display update lag. Only works if `dynamic_miniters`
or monitor thread is enabled.
@@ -948,10 +990,8 @@
delta_it = n - last_print_n
# EMA (not just overall average)
if smoothing and delta_t and delta_it:
- avg_time = delta_t / delta_it \
- if avg_time is None \
- else smoothing * delta_t / delta_it + \
- (1 - smoothing) * avg_time
+ rate = delta_t / delta_it
+ avg_time = self.ema(rate, avg_time, smoothing)
self.avg_time = avg_time
self.n = n
@@ -977,10 +1017,10 @@
elif smoothing:
# EMA-weight miniters to converge
# towards the timeframe of mininterval
- miniters = smoothing * delta_it * \
- (mininterval / delta_t
- if mininterval and delta_t else 1) + \
- (1 - smoothing) * miniters
+ rate = delta_it
+ if mininterval and delta_t:
+ rate *= mininterval / delta_t
+ miniters = self.ema(rate, miniters, smoothing)
else:
# Maximum nb of iterations between 2 prints
miniters = max(miniters, delta_it)
@@ -1034,10 +1074,8 @@
# elapsed = cur_t - self.start_t
# EMA (not just overall average)
if self.smoothing and delta_t and delta_it:
- self.avg_time = delta_t / delta_it \
- if self.avg_time is None \
- else self.smoothing * delta_t / delta_it + \
- (1 - self.smoothing) * self.avg_time
+ rate = delta_t / delta_it
+ self.avg_time = self.ema(rate, self.avg_time, self.smoothing)
if not hasattr(self, "sp"):
raise TqdmDeprecationWarning("""\
@@ -1181,7 +1219,7 @@
for key in postfix.keys():
# Number: limit the length of the string
if isinstance(postfix[key], Number):
- postfix[key] = '{0:2.3g}'.format(postfix[key])
+ postfix[key] = self.format_num(postfix[key])
# Else for any other type, try to get the string conversion
elif not isinstance(postfix[key], _basestring):
postfix[key] = str(postfix[key])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tqdm-4.26.0/tqdm/_tqdm_gui.py new/tqdm-4.27.0/tqdm/_tqdm_gui.py
--- old/tqdm-4.26.0/tqdm/_tqdm_gui.py 2018-05-14 01:34:20.000000000 +0200
+++ new/tqdm-4.27.0/tqdm/_tqdm_gui.py 2018-10-15 18:09:30.000000000 +0200
@@ -140,11 +140,9 @@
if delta_t >= mininterval:
elapsed = cur_t - start_t
# EMA (not just overall average)
- if smoothing and delta_t:
- avg_time = delta_t / delta_it \
- if avg_time is None \
- else smoothing * delta_t / delta_it + \
- (1 - smoothing) * avg_time
+ if smoothing and delta_t and delta_it:
+ rate = delta_t / delta_it
+ avg_time = self.ema(rate, avg_time, smoothing)
# Inline due to multiple calls
total = self.total
@@ -208,11 +206,12 @@
elif mininterval and delta_t:
# EMA-weight miniters to converge
# towards the timeframe of mininterval
- miniters = smoothing * delta_it * mininterval \
- / delta_t + (1 - smoothing) * miniters
+ rate = delta_it
+ if mininterval and delta_t:
+ rate *= mininterval / delta_t
+ miniters = self.ema(rate, miniters, smoothing)
else:
- miniters = smoothing * delta_it + \
- (1 - smoothing) * miniters
+ miniters = self.ema(delta_it, miniters, smoothing)
# Store old values for next call
last_print_n = n
@@ -242,11 +241,9 @@
if delta_t >= self.mininterval:
elapsed = cur_t - self.start_t
# EMA (not just overall average)
- if self.smoothing and delta_t:
- self.avg_time = delta_t / delta_it \
- if self.avg_time is None \
- else self.smoothing * delta_t / delta_it + \
- (1 - self.smoothing) * self.avg_time
+ if self.smoothing and delta_t and delta_it:
+ rate = delta_t / delta_it
+ self.avg_time = self.ema(rate, self.avg_time, self.smoothing)
# Inline due to multiple calls
total = self.total
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tqdm-4.26.0/tqdm/_tqdm_notebook.py new/tqdm-4.27.0/tqdm/_tqdm_notebook.py
--- old/tqdm-4.26.0/tqdm/_tqdm_notebook.py 2018-09-11 21:25:42.000000000 +0200
+++ new/tqdm-4.27.0/tqdm/_tqdm_notebook.py 2018-10-15 18:09:30.000000000 +0200
@@ -19,9 +19,15 @@
if True: # pragma: no cover
# import IPython/Jupyter base widget and display utilities
+ IPY = 0
+ IPYW = 0
try: # IPython 4.x
import ipywidgets
IPY = 4
+ try:
+ IPYW = int(ipywidgets.__version__.split('.')[0])
+ except AttributeError: # __version__ may not exist in old versions
+ pass
except ImportError: # IPython 3.x / 2.x
IPY = 32
import warnings
@@ -108,6 +114,8 @@
if desc:
pbar.description = desc
+ if IPYW >= 7:
+ pbar.style.description_width = 'initial'
# Prepare status text
ptext = HTML()
# Only way to place text to the right of the bar is to use a container
@@ -116,9 +124,11 @@
if ncols is not None: # use default style of ipywidgets
# ncols could be 100, "100px", "100%"
ncols = str(ncols) # ipywidgets only accepts string
- if ncols[-1].isnumeric():
- # if last value is digit, assume the value is digit
- ncols += 'px'
+ try:
+ if int(ncols) > 0: # isnumeric and positive
+ ncols += 'px'
+ except ValueError:
+ pass
pbar.layout.flex = '2'
container.layout.width = ncols
container.layout.display = 'inline-flex'
@@ -170,6 +180,8 @@
# Update description
if desc:
pbar.description = desc
+ if IPYW >= 7:
+ pbar.style.description_width = 'initial'
return print_status
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tqdm-4.26.0/tqdm/_version.py new/tqdm-4.27.0/tqdm/_version.py
--- old/tqdm-4.26.0/tqdm/_version.py 2018-09-11 21:25:42.000000000 +0200
+++ new/tqdm-4.27.0/tqdm/_version.py 2018-10-15 18:23:51.000000000 +0200
@@ -5,7 +5,7 @@
__all__ = ["__version__"]
# major, minor, patch, -extra
-version_info = 4, 26, 0
+version_info = 4, 27, 0
# Nice string for the version
__version__ = '.'.join(map(str, version_info))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tqdm-4.26.0/tqdm/auto/__init__.py new/tqdm-4.27.0/tqdm/auto/__init__.py
--- old/tqdm-4.26.0/tqdm/auto/__init__.py 1970-01-01 01:00:00.000000000 +0100
+++ new/tqdm-4.27.0/tqdm/auto/__init__.py 2018-10-15 18:09:30.000000000 +0200
@@ -0,0 +1,6 @@
+import warnings
+from .._tqdm import TqdmExperimentalWarning
+with warnings.catch_warnings():
+ warnings.simplefilter("ignore", category=TqdmExperimentalWarning)
+ from ..autonotebook import tqdm, trange
+__all__ = ["tqdm", "trange"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tqdm-4.26.0/tqdm/tests/tests_tqdm.py new/tqdm-4.27.0/tqdm/tests/tests_tqdm.py
--- old/tqdm-4.26.0/tqdm/tests/tests_tqdm.py 2018-09-11 21:25:42.000000000 +0200
+++ new/tqdm-4.27.0/tqdm/tests/tests_tqdm.py 2018-10-15 18:09:30.000000000 +0200
@@ -209,6 +209,15 @@
assert format_interval(238113) == '66:08:33'
+def test_format_num():
+ """Test number format"""
+ format_num = tqdm.format_num
+
+ assert float(format_num(1337)) == 1337
+ assert format_num(int(1e6)) == '1e+6'
+ assert format_num(1239876) == '1''239''876'
+
+
def test_format_meter():
"""Test statistics and progress bar formatting"""
try:
@@ -1604,14 +1613,21 @@
internal(our_file, True)
-@with_setup(pretest, posttest)
-def test_autonotebook():
- """Test autonotebook fallback"""
- from tqdm.autonotebook import tqdm as tn
- from tqdm.autonotebook import trange as tr
+def backendCheck(module):
+ """Test tqdm-like module fallback"""
+ tn = module.tqdm
+ tr = module.trange
with closing(StringIO()) as our_file:
with tn(total=10, file=our_file) as t:
assert len(t) == 10
with tr(1337) as t:
assert len(t) == 1337
+
+
+@with_setup(pretest, posttest)
+def test_auto():
+ """Test auto fallback"""
+ from tqdm import autonotebook, auto
+ backendCheck(autonotebook)
+ backendCheck(auto)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tqdm-4.26.0/tqdm.1 new/tqdm-4.27.0/tqdm.1
--- old/tqdm-4.26.0/tqdm.1 2018-05-22 21:07:35.000000000 +0200
+++ new/tqdm-4.27.0/tqdm.1 2018-10-15 18:09:30.000000000 +0200
@@ -84,13 +84,13 @@
.TP
.B \-\-mininterval=\f[I]mininterval\f[]
float, optional.
-Minimum progress display update interval, in seconds [default: 0.1].
+Minimum progress display update interval [default: 0.1] seconds.
.RS
.RE
.TP
.B \-\-maxinterval=\f[I]maxinterval\f[]
float, optional.
-Maximum progress display update interval, in seconds [default: 10].
+Maximum progress display update interval [default: 10] seconds.
Automatically adjusts \f[C]miniters\f[] to correspond to
\f[C]mininterval\f[] after long display update lag.
Only works if \f[C]dynamic_miniters\f[] or monitor thread is enabled.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tqdm-4.26.0/tqdm.egg-info/PKG-INFO new/tqdm-4.27.0/tqdm.egg-info/PKG-INFO
--- old/tqdm-4.26.0/tqdm.egg-info/PKG-INFO 2018-09-11 21:28:07.000000000 +0200
+++ new/tqdm-4.27.0/tqdm.egg-info/PKG-INFO 2018-10-15 18:32:17.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: tqdm
-Version: 4.26.0
+Version: 4.27.0
Summary: Fast, Extensible Progress Meter
Home-page: https://github.com/tqdm/tqdm
Author: Noam Yorav-Raphael
@@ -276,7 +276,7 @@
maxinterval=10.0, miniters=None, ascii=None, disable=False,
unit='it', unit_scale=False, dynamic_ncols=False,
smoothing=0.3, bar_format=None, initial=0, position=None,
- postfix=None):
+ postfix=None, unit_divisor=1000):
Parameters
~~~~~~~~~~
@@ -287,7 +287,7 @@
* desc : str, optional
Prefix for the progressbar.
* total : int, optional
- The number of expected iterations. If (default: None),
+ The number of expected iterations. If unspecified,
len(iterable) is used if possible. As a last resort, only basic
progress statistics are displayed (no ETA, no progressbar).
If ``gui`` is True and this parameter needs subsequent updating,
@@ -307,9 +307,9 @@
fallback is a meter width of 10 and no limit for the counter and
statistics. If 0, will not print any meter (only stats).
* mininterval : float, optional
- Minimum progress display update interval, in seconds [default: 0.1].
+ Minimum progress display update interval [default: 0.1] seconds.
* maxinterval : float, optional
- Maximum progress display update interval, in seconds [default: 10].
+ Maximum progress display update interval [default: 10] seconds.
Automatically adjusts ``miniters`` to correspond to ``mininterval``
after long display update lag. Only works if ``dynamic_miniters``
or monitor thread is enabled.
@@ -326,7 +326,7 @@
the meter. The fallback is to use ASCII characters ``1-9 #``.
* disable : bool, optional
Whether to disable the entire progressbar wrapper
- [default: False].
+ [default: False]. If set to None, disable on non-TTY.
* unit : str, optional
String that will be used to define the unit of each iteration
[default: it].
@@ -348,10 +348,10 @@
[default: '{l_bar}{bar}{r_bar}'], where
l_bar='{desc}: {percentage:3.0f}%|' and
r_bar='| {n_fmt}/{total_fmt} [{elapsed}<{remaining}, '
- '{rate_fmt}{postfix}]'
+ '{rate_fmt}{postfix}]'
Possible vars: l_bar, bar, r_bar, n, n_fmt, total, total_fmt,
- percentage, rate, rate_fmt, rate_noinv, rate_noinv_fmt,
- rate_inv, rate_inv_fmt, elapsed, remaining, desc, postfix.
+ percentage, rate, rate_fmt, rate_noinv, rate_noinv_fmt,
+ rate_inv, rate_inv_fmt, elapsed, remaining, desc, postfix.
Note that a trailing ": " is automatically removed after {desc}
if the latter is empty.
* initial : int, optional
@@ -685,7 +685,8 @@
Note that this will issue a ``TqdmExperimentalWarning`` if run in a notebook
since it is not meant to be possible to distinguish between ``jupyter notebook``
- and ``jupyter console``.
+ and ``jupyter console``. Use ``auto`` instead of ``autonotebook`` to suppress
+ this warning.
Writing messages
~~~~~~~~~~~~~~~~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tqdm-4.26.0/tqdm.egg-info/SOURCES.txt new/tqdm-4.27.0/tqdm.egg-info/SOURCES.txt
--- old/tqdm-4.26.0/tqdm.egg-info/SOURCES.txt 2018-09-11 21:28:07.000000000 +0200
+++ new/tqdm-4.27.0/tqdm.egg-info/SOURCES.txt 2018-10-15 18:32:17.000000000 +0200
@@ -35,6 +35,7 @@
tqdm.egg-info/dependency_links.txt
tqdm.egg-info/entry_points.txt
tqdm.egg-info/top_level.txt
+tqdm/auto/__init__.py
tqdm/autonotebook/__init__.py
tqdm/tests/tests_main.py
tqdm/tests/tests_pandas.py
1
0
Hello community,
here is the log from the commit of package python-shodan for openSUSE:Factory checked in at 2018-10-31 13:12:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-shodan (Old)
and /work/SRC/openSUSE:Factory/.python-shodan.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-shodan"
Wed Oct 31 13:12:09 2018 rev:7 rq:643570 version:1.10.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-shodan/python-shodan.changes 2018-10-11 11:48:07.654582516 +0200
+++ /work/SRC/openSUSE:Factory/.python-shodan.new/python-shodan.changes 2018-10-31 13:12:15.711580377 +0100
@@ -1,0 +2,6 @@
+Sun Oct 14 13:29:33 UTC 2018 - Sebastian Wagner <sebix+novell.com(a)sebix.at>
+
+- update to version 1.10.4:
+ * Fix a bug when showing old banner records that don't have the "transport" property
+
+-------------------------------------------------------------------
Old:
----
shodan-1.10.3.tar.gz
New:
----
shodan-1.10.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-shodan.spec ++++++
--- /var/tmp/diff_new_pack.JLL1Im/_old 2018-10-31 13:12:20.303575919 +0100
+++ /var/tmp/diff_new_pack.JLL1Im/_new 2018-10-31 13:12:20.303575919 +0100
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%{!?license: %global license %doc}
Name: python-shodan
-Version: 1.10.3
+Version: 1.10.4
Release: 0
Summary: Python library and command-line utility for Shodan
License: MIT
++++++ shodan-1.10.3.tar.gz -> shodan-1.10.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shodan-1.10.3/PKG-INFO new/shodan-1.10.4/PKG-INFO
--- old/shodan-1.10.3/PKG-INFO 2018-09-22 04:41:44.000000000 +0200
+++ new/shodan-1.10.4/PKG-INFO 2018-10-05 03:00:20.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: shodan
-Version: 1.10.3
+Version: 1.10.4
Summary: Python library and command-line utility for Shodan (https://developer.shodan.io)
Home-page: http://github.com/achillean/shodan-python/tree/master
Author: John Matherly
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shodan-1.10.3/setup.cfg new/shodan-1.10.4/setup.cfg
--- old/shodan-1.10.3/setup.cfg 2018-09-22 04:41:44.000000000 +0200
+++ new/shodan-1.10.4/setup.cfg 2018-10-05 03:00:20.000000000 +0200
@@ -1,5 +1,4 @@
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shodan-1.10.3/setup.py new/shodan-1.10.4/setup.py
--- old/shodan-1.10.3/setup.py 2018-09-22 04:14:46.000000000 +0200
+++ new/shodan-1.10.4/setup.py 2018-10-05 02:49:51.000000000 +0200
@@ -7,7 +7,7 @@
setup(
name = 'shodan',
- version = '1.10.3',
+ version = '1.10.4',
description = 'Python library and command-line utility for Shodan (https://developer.shodan.io)',
long_description = README,
long_description_content_type = 'text/x-rst',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shodan-1.10.3/shodan/__main__.py new/shodan-1.10.4/shodan/__main__.py
--- old/shodan-1.10.3/shodan/__main__.py 2018-09-22 04:14:03.000000000 +0200
+++ new/shodan-1.10.4/shodan/__main__.py 2018-10-05 02:49:11.000000000 +0200
@@ -230,7 +230,7 @@
if count >= limit:
break
- except:
+ except Exception:
pass
# Let the user know we're done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shodan-1.10.3/shodan/cli/host.py new/shodan-1.10.4/shodan/cli/host.py
--- old/shodan-1.10.3/shodan/cli/host.py 2018-08-17 22:44:48.000000000 +0200
+++ new/shodan-1.10.4/shodan/cli/host.py 2018-10-05 01:20:34.000000000 +0200
@@ -80,8 +80,9 @@
version = '({})'.format(banner['version'])
click.echo(click.style('{:>7d}'.format(banner['port']), fg='cyan'), nl=False)
- click.echo('/', nl=False)
- click.echo(click.style('{} '.format(banner['transport']), fg='yellow'), nl=False)
+ if 'transport' in banner:
+ click.echo('/', nl=False)
+ click.echo(click.style('{} '.format(banner['transport']), fg='yellow'), nl=False)
click.echo('{} {}'.format(product, version), nl=False)
if history:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shodan-1.10.3/shodan/helpers.py new/shodan-1.10.4/shodan/helpers.py
--- old/shodan-1.10.3/shodan/helpers.py 2018-09-22 04:14:03.000000000 +0200
+++ new/shodan-1.10.4/shodan/helpers.py 2018-09-23 03:58:44.000000000 +0200
@@ -98,7 +98,7 @@
# pylint: disable=E0401
try:
from ujson import loads
- except:
+ except Exception:
pass
if isinstance(files, basestring):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shodan-1.10.3/shodan.egg-info/PKG-INFO new/shodan-1.10.4/shodan.egg-info/PKG-INFO
--- old/shodan-1.10.3/shodan.egg-info/PKG-INFO 2018-09-22 04:41:44.000000000 +0200
+++ new/shodan-1.10.4/shodan.egg-info/PKG-INFO 2018-10-05 03:00:20.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: shodan
-Version: 1.10.3
+Version: 1.10.4
Summary: Python library and command-line utility for Shodan (https://developer.shodan.io)
Home-page: http://github.com/achillean/shodan-python/tree/master
Author: John Matherly
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shodan-1.10.3/shodan.egg-info/requires.txt new/shodan-1.10.4/shodan.egg-info/requires.txt
--- old/shodan-1.10.3/shodan.egg-info/requires.txt 2018-09-22 04:41:44.000000000 +0200
+++ new/shodan-1.10.4/shodan.egg-info/requires.txt 2018-10-05 03:00:20.000000000 +0200
@@ -1,5 +1,5 @@
+XlsxWriter
click
click-plugins
colorama
requests>=2.2.1
-XlsxWriter
1
0
Hello community,
here is the log from the commit of package python-pymisp for openSUSE:Factory checked in at 2018-10-31 13:11:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pymisp (Old)
and /work/SRC/openSUSE:Factory/.python-pymisp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pymisp"
Wed Oct 31 13:11:58 2018 rev:11 rq:643569 version:2.4.96
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pymisp/python-pymisp.changes 2018-10-11 11:48:28.786555629 +0200
+++ /work/SRC/openSUSE:Factory/.python-pymisp.new/python-pymisp.changes 2018-10-31 13:12:04.419591346 +0100
@@ -1,0 +2,30 @@
+Sun Oct 14 13:32:09 UTC 2018 - Sebastian Wagner <sebix+novell.com(a)sebix.at>
+
+- Remove fix-274.patch and fix-274-1.patch.
+- update to version 2.4.96:
+ - New
+ - [freedFromRedis] try to create an object/attribute out of the incoming
+ data even if not added with the helper.
+ - Direct_call without data means GET.
+ - Add direct call to just post data on a URL.
+ - Update warninglists.
+ - Toggle warning list, add test case.
+ - Add lots of test cases, find lots of bugs.
+ - Use new CSV interface, add test cases.
+ - Changes
+ - Allow to pass a json string to direct_call.
+ - Update order parameters & doc.
+ - Add an extra IP from the warninglists.
+ - Fix
+ - Prevent checking length on a integer.
+ - Use proper dependency (enum34)
+ - Other
+ - Fixed leaked taxonomy tags problem.
+ - Added some getters and setters for taxonomies, warninglists,
+ noticelists and tags & documentation.
+ - Add: Advanced Extraction to upload_sample.
+ - Add: update noticelists and object templates.
+ - Add: Add __eq__ to AbstractMISP.
+ Allow to discard duplicate tags.
+
+-------------------------------------------------------------------
Old:
----
fix-274-1.patch
fix-274.patch
pymisp-2.4.95.1.tar.gz
New:
----
pymisp-2.4.96.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pymisp.spec ++++++
--- /var/tmp/diff_new_pack.abWphW/_old 2018-10-31 13:12:06.627589200 +0100
+++ /var/tmp/diff_new_pack.abWphW/_new 2018-10-31 13:12:06.639589189 +0100
@@ -19,17 +19,13 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%{!?license: %global license %doc}
Name: python-pymisp
-Version: 2.4.95.1
+Version: 2.4.96
Release: 0
Summary: Python API for MISP
License: BSD-2-Clause
Group: Development/Languages/Python
Url: https://github.com/MISP/PyMISP
Source: https://files.pythonhosted.org/packages/source/p/pymisp/pymisp-%{version}.t…
-# PATCH-FIX-UPSTREAM fix-274.patch
-Patch0: https://github.com/MISP/PyMISP/commit/ceedb6e95c07a10eac091277a57af6b21e0d8…
-# PATCH-FIX-UPSTREAM fix-274-1.patch
-Patch1: https://github.com/MISP/PyMISP/commit/f0f3b3f8441bd8b0179ca18b11e1aacaf1d2f…
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -74,8 +70,6 @@
%prep
%setup -q -n pymisp-%{version}
-%patch0 -p1
-%patch1 -p1
find pymisp examples -name "*.py" -type f -exec sed -i '1s/^#!.*//' '{}' \+
%build
++++++ pymisp-2.4.95.1.tar.gz -> pymisp-2.4.96.tar.gz ++++++
++++ 3248 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package 000product for openSUSE:Factory checked in at 2018-10-29 17:45:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000product (Old)
and /work/SRC/openSUSE:Factory/.000product.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000product"
Mon Oct 29 17:45:18 2018 rev:629 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
_service:product_converter:openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi: same change
_service:product_converter:openSUSE-Addon-NonOss-release.spec: same change
++++++ _service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.bTez0e/_old 2018-10-29 17:45:30.387931483 +0100
+++ /var/tmp/diff_new_pack.bTez0e/_new 2018-10-29 17:45:30.391931480 +0100
@@ -78,6 +78,7 @@
<repopackage name="bash"/>
<repopackage name="bash"/>
<repopackage name="bash-completion"/>
+ <repopackage name="bind-utils"/>
<repopackage name="biosdevname"/>
<repopackage name="blog"/>
<repopackage name="blog"/>
@@ -137,6 +138,8 @@
<repopackage name="dbus-1"/>
<repopackage name="dbus-1-glib"/>
<repopackage name="device-mapper"/>
+ <repopackage name="dhcp"/>
+ <repopackage name="dhcp-client"/>
<repopackage name="diffutils"/>
<repopackage name="diffutils"/>
<repopackage name="diffutils"/>
@@ -190,10 +193,8 @@
<repopackage name="gawk"/>
<repopackage name="gawk"/>
<repopackage name="gawk"/>
+ <repopackage name="GeoIP-data"/>
<repopackage name="gettext-runtime"/>
- <repopackage name="ghc-bootstrap"/>
- <repopackage name="ghc-bootstrap"/>
- <repopackage name="ghc-bootstrap"/>
<repopackage name="gio-branding-openSUSE"/>
<repopackage name="gio-branding-openSUSE"/>
<repopackage name="gio-branding-openSUSE"/>
@@ -207,9 +208,6 @@
<repopackage name="glibc"/>
<repopackage name="glibc"/>
<repopackage name="glibc-locale"/>
- <repopackage name="gmp-devel"/>
- <repopackage name="gmp-devel"/>
- <repopackage name="gmp-devel"/>
<repopackage name="gpg2"/>
<repopackage name="gpg2"/>
<repopackage name="gpg2"/>
@@ -319,6 +317,7 @@
<repopackage name="libauparse0"/>
<repopackage name="libbasicobjects0"/>
<repopackage name="libbasicobjects0"/>
+ <repopackage name="libbind9-160"/>
<repopackage name="libblkid1"/>
<repopackage name="libblkid1"/>
<repopackage name="libblkid1"/>
@@ -368,6 +367,7 @@
<repopackage name="libdhash1"/>
<repopackage name="libdhash1"/>
<repopackage name="libdnet1"/>
+ <repopackage name="libdns169"/>
<repopackage name="libdw1"/>
<repopackage name="libdw1"/>
<repopackage name="libdw1"/>
@@ -392,6 +392,9 @@
<repopackage name="libfdisk1"/>
<repopackage name="libfdisk1"/>
<repopackage name="libfdisk1"/>
+ <repopackage name="libffi7"/>
+ <repopackage name="libffi7"/>
+ <repopackage name="libffi7"/>
<repopackage name="libfipscheck1"/>
<repopackage name="libfreebl3"/>
<repopackage name="libfreetype6"/>
@@ -409,6 +412,7 @@
<repopackage name="libgdbm_compat4"/>
<repopackage name="libgdbm_compat4"/>
<repopackage name="libgdbm_compat4"/>
+ <repopackage name="libGeoIP1"/>
<repopackage name="libgio-2_0-0"/>
<repopackage name="libgio-2_0-0"/>
<repopackage name="libgio-2_0-0"/>
@@ -421,9 +425,6 @@
<repopackage name="libgmp10"/>
<repopackage name="libgmp10"/>
<repopackage name="libgmp10"/>
- <repopackage name="libgmpxx4"/>
- <repopackage name="libgmpxx4"/>
- <repopackage name="libgmpxx4"/>
<repopackage name="libgnutls30"/>
<repopackage name="libgnutls30"/>
<repopackage name="libgnutls30"/>
@@ -454,6 +455,10 @@
<repopackage name="libiptc0"/>
<repopackage name="libiptc0"/>
<repopackage name="libiptc0"/>
+ <repopackage name="libirs160"/>
+ <repopackage name="libisc166"/>
+ <repopackage name="libisccc160"/>
+ <repopackage name="libisccfg160"/>
<repopackage name="libjansson4"/>
<repopackage name="libjansson4"/>
<repopackage name="libjansson4"/>
@@ -487,6 +492,7 @@
<repopackage name="liblua5_3-5"/>
<repopackage name="liblvm2app2_2"/>
<repopackage name="liblvm2cmd2_02"/>
+ <repopackage name="liblwres160"/>
<repopackage name="liblz4-1"/>
<repopackage name="liblz4-1"/>
<repopackage name="liblz4-1"/>
@@ -510,9 +516,6 @@
<repopackage name="libmount1"/>
<repopackage name="libmount1"/>
<repopackage name="libmspack0"/>
- <repopackage name="libncurses5"/>
- <repopackage name="libncurses5"/>
- <repopackage name="libncurses5"/>
<repopackage name="libncurses6"/>
<repopackage name="libncurses6"/>
<repopackage name="libncurses6"/>
@@ -818,6 +821,7 @@
<repopackage name="python3-base"/>
<repopackage name="python3-base"/>
<repopackage name="python3-base"/>
+ <repopackage name="python3-bind"/>
<repopackage name="python3-blinker"/>
<repopackage name="python3-cephfs"/>
<repopackage name="python3-certifi"/>
@@ -834,6 +838,7 @@
<repopackage name="python3-MarkupSafe"/>
<repopackage name="python3-oauthlib"/>
<repopackage name="python3-packaging"/>
+ <repopackage name="python3-ply"/>
<repopackage name="python3-PrettyTable"/>
<repopackage name="python3-py"/>
<repopackage name="python3-pyasn1"/>
_service:product_converter:openSUSE-cd-mini-i586.kiwi: same change
_service:product_converter:openSUSE-cd-mini-x86_64.kiwi: same change
_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi: same change
_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi: same change
_service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi: same change
++++++ _service:product_converter:openSUSE-release.spec ++++++
++++ 34804 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/000product/_service:product_converter:openSUSE-release.spec
++++ and /work/SRC/openSUSE:Factory/.000product.new/_service:product_converter:openSUSE-release.spec
openSUSE-release.spec: same change
++++++ obsoletepackages.inc ++++++
++++ 17444 lines (skipped)
++++ between obsoletepackages.inc
++++ and /work/SRC/openSUSE:Factory/.000product.new/obsoletepackages.inc
++++++ openSUSE-Kubic-3.group ++++++
--- /var/tmp/diff_new_pack.bTez0e/_old 2018-10-29 17:45:30.711931293 +0100
+++ /var/tmp/diff_new_pack.bTez0e/_new 2018-10-29 17:45:30.711931293 +0100
@@ -44,12 +44,10 @@
<package name="fillup"/>
<package name="findutils"/>
<package name="gawk"/>
- <package name="ghc-bootstrap"/>
<package name="gio-branding-openSUSE"/>
<package name="glib-networking"/>
<package name="glib2-tools"/>
<package name="glibc"/>
- <package name="gmp-devel"/>
<package name="gpg2"/>
<package name="grep"/>
<package name="gsettings-desktop-schemas"/>
@@ -97,6 +95,7 @@
<package name="libexpat1"/>
<package name="libext2fs2"/>
<package name="libfdisk1"/>
+ <package name="libffi7"/>
<package name="libgcc_s1"/>
<package name="libgcrypt20"/>
<package name="libgdbm5"/>
@@ -105,7 +104,6 @@
<package name="libglib-2_0-0"/>
<package name="libgmodule-2_0-0"/>
<package name="libgmp10"/>
- <package name="libgmpxx4"/>
<package name="libgnutls30"/>
<package name="libgobject-2_0-0"/>
<package name="libgpg-error0"/>
@@ -131,7 +129,6 @@
<package name="libmnl0"/>
<package name="libmodman1"/>
<package name="libmount1"/>
- <package name="libncurses5"/>
<package name="libncurses6"/>
<package name="libnetfilter_conntrack3"/>
<package name="libnettle6"/>
++++++ openSUSE-Kubic-DVD.group ++++++
--- /var/tmp/diff_new_pack.bTez0e/_old 2018-10-29 17:45:30.727931283 +0100
+++ /var/tmp/diff_new_pack.bTez0e/_new 2018-10-29 17:45:30.727931283 +0100
@@ -43,13 +43,11 @@
<package name="fillup"/>
<package name="findutils"/>
<package name="gawk"/>
- <package name="ghc-bootstrap"/>
<package name="gio-branding-openSUSE"/>
<package name="glib-networking"/>
<package name="glib2-tools"/>
<package name="glibc"/>
<package name="glibc-locale"/>
- <package name="gmp-devel"/>
<package name="gpg2"/>
<package name="grep"/>
<package name="gsettings-desktop-schemas"/>
@@ -103,6 +101,7 @@
<package name="libexpat1"/>
<package name="libext2fs2"/>
<package name="libfdisk1"/>
+ <package name="libffi7"/>
<package name="libfuse2"/>
<package name="libgcc_s1"/>
<package name="libgcrypt20"/>
@@ -112,7 +111,6 @@
<package name="libglib-2_0-0"/>
<package name="libgmodule-2_0-0"/>
<package name="libgmp10"/>
- <package name="libgmpxx4"/>
<package name="libgnutls30"/>
<package name="libgobject-2_0-0"/>
<package name="libgpg-error0"/>
@@ -141,7 +139,6 @@
<package name="libmodman1"/>
<package name="libmount1"/>
<package name="libmspack0"/>
- <package name="libncurses5"/>
<package name="libncurses6"/>
<package name="libnetfilter_conntrack3"/>
<package name="libnettle6"/>
++++++ openSUSE-Kubic.group ++++++
--- /var/tmp/diff_new_pack.bTez0e/_old 2018-10-29 17:45:30.739931277 +0100
+++ /var/tmp/diff_new_pack.bTez0e/_new 2018-10-29 17:45:30.739931277 +0100
@@ -2,6 +2,7 @@
<!-- Autogenerated by https://github.com/openSUSE/package-lists -->
<group name="openSUSE-Kubic">
<packagelist>
+ <package name="GeoIP-data"/>
<package name="aaa_base"/>
<package name="attr"/>
<package name="audit"/>
@@ -9,6 +10,7 @@
<package name="babeltrace"/>
<package name="bash"/>
<package name="bash-completion"/>
+ <package name="bind-utils"/>
<package name="biosdevname"/>
<package name="blog"/>
<package name="boost-license1_68_0"/>
@@ -35,6 +37,8 @@
<package name="dbus-1"/>
<package name="dbus-1-glib"/>
<package name="device-mapper"/>
+ <package name="dhcp"/>
+ <package name="dhcp-client"/>
<package name="diffutils"/>
<package name="dmidecode"/>
<package name="dosfstools"/>
@@ -53,12 +57,10 @@
<package name="fipscheck"/>
<package name="gawk"/>
<package name="gettext-runtime"/>
- <package name="ghc-bootstrap"/>
<package name="gio-branding-openSUSE"/>
<package name="glib-networking"/>
<package name="glib2-tools"/>
<package name="glibc"/>
- <package name="gmp-devel"/>
<package name="gpg2"/>
<package name="gptfdisk"/>
<package name="grep"/>
@@ -98,6 +100,7 @@
<package name="kubernetes-kubelet"/>
<package name="kubic-locale-archive"/>
<package name="less"/>
+ <package name="libGeoIP1"/>
<package name="libacl1"/>
<package name="libaio1"/>
<package name="libapparmor1"/>
@@ -109,6 +112,7 @@
<package name="libaudit1"/>
<package name="libaugeas0"/>
<package name="libauparse0"/>
+ <package name="libbind9-160"/>
<package name="libblkid1"/>
<package name="libboost_system1_68_0"/>
<package name="libboost_thread1_68_0"/>
@@ -129,6 +133,7 @@
<package name="libdbus-1-3"/>
<package name="libdevmapper-event1_03"/>
<package name="libdevmapper1_03"/>
+ <package name="libdns169"/>
<package name="libdw1"/>
<package name="libebl-plugins"/>
<package name="libedit0"/>
@@ -141,6 +146,7 @@
<package name="libext2fs2"/>
<package name="libfastjson4"/>
<package name="libfdisk1"/>
+ <package name="libffi7"/>
<package name="libfipscheck1"/>
<package name="libfreebl3"/>
<package name="libfreetype6"/>
@@ -153,7 +159,6 @@
<package name="libglib-2_0-0"/>
<package name="libgmodule-2_0-0"/>
<package name="libgmp10"/>
- <package name="libgmpxx4"/>
<package name="libgnutls30"/>
<package name="libgobject-2_0-0"/>
<package name="libgpg-error0"/>
@@ -164,6 +169,10 @@
<package name="libibverbs1"/>
<package name="libidn2-0"/>
<package name="libiptc0"/>
+ <package name="libirs160"/>
+ <package name="libisc166"/>
+ <package name="libisccc160"/>
+ <package name="libisccfg160"/>
<package name="libjansson4"/>
<package name="libjson-c4"/>
<package name="libkeyutils1"/>
@@ -177,6 +186,7 @@
<package name="liblua5_3-5"/>
<package name="liblvm2app2_2"/>
<package name="liblvm2cmd2_02"/>
+ <package name="liblwres160"/>
<package name="liblz4-1"/>
<package name="liblzma5"/>
<package name="liblzo2-2"/>
@@ -187,7 +197,6 @@
<package name="libmnl0"/>
<package name="libmodman1"/>
<package name="libmount1"/>
- <package name="libncurses5"/>
<package name="libncurses6"/>
<package name="libnetfilter_conntrack3"/>
<package name="libnettle6"/>
@@ -320,6 +329,7 @@
<package name="python3-appdirs"/>
<package name="python3-asn1crypto"/>
<package name="python3-base"/>
+ <package name="python3-bind"/>
<package name="python3-blinker"/>
<package name="python3-cephfs"/>
<package name="python3-certifi"/>
@@ -334,6 +344,7 @@
<package name="python3-jsonschema"/>
<package name="python3-oauthlib"/>
<package name="python3-packaging"/>
+ <package name="python3-ply"/>
<package name="python3-py"/>
<package name="python3-pyasn1"/>
<package name="python3-pycparser"/>
1
0
Hello community,
here is the log from the commit of package 000product for openSUSE:Factory checked in at 2018-10-29 14:23:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000product (Old)
and /work/SRC/openSUSE:Factory/.000product.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000product"
Mon Oct 29 14:23:36 2018 rev:628 rq: version:unknown
Mon Oct 29 14:23:28 2018 rev:627 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
_service:product_converter:openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi: same change
_service:product_converter:openSUSE-Addon-NonOss-release.spec: same change
++++++ _service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.eH9IQQ/_old 2018-10-29 14:59:07.818035413 +0100
+++ /var/tmp/diff_new_pack.eH9IQQ/_new 2018-10-29 14:59:07.818035413 +0100
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-Tumbleweed-Kubic___20181026" schemaversion="4.1">
+<image name="OBS__openSUSE-Tumbleweed-Kubic___20181029" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,9 +35,9 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20181026</productvar>
+ <productvar name="VERSION">20181029</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-tumbleweed-kubic:20181026,openSUSE Tumbleweed Kubic</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-tumbleweed-kubic:20181029,openSUSE Tumbleweed Kubic</productinfo>
<productinfo name="LINGUAS">en_US </productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
++++++ _service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec ++++++
--- /var/tmp/diff_new_pack.eH9IQQ/_old 2018-10-29 14:59:07.834035430 +0100
+++ /var/tmp/diff_new_pack.eH9IQQ/_new 2018-10-29 14:59:07.834035430 +0100
@@ -17,7 +17,7 @@
Name: openSUSE-Tumbleweed-Kubic-release
-Version: 20181026
+Version: 20181029
Release: 0
Summary: openSUSE Tumbleweed Kubic
License: GPL-2.0-or-later
@@ -38,9 +38,9 @@
ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64
Provides: %name-%version
Provides: product() = openSUSE-Tumbleweed-Kubic
-Provides: product(openSUSE-Tumbleweed-Kubic) = 20181026-0
+Provides: product(openSUSE-Tumbleweed-Kubic) = 20181029-0
Provides: product-label() = openSUSE%20Tumbleweed%20Kubic
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dtumbleweed%2Dkubic%3A20181026
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dtumbleweed%2Dkubic%3A20181029
Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
Provides: product-endoflife()
Requires: product_flavor(openSUSE-Tumbleweed-Kubic)
@@ -61,7 +61,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(dvd)
-Provides: product_flavor(openSUSE-Tumbleweed-Kubic) = 20181026-0
+Provides: product_flavor(openSUSE-Tumbleweed-Kubic) = 20181029-0
Summary: openSUSE Tumbleweed Kubic
%description dvd
@@ -123,11 +123,11 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>openSUSE-Tumbleweed-Kubic</name>
- <version>20181026</version>
+ <version>20181029</version>
<release>0</release>
<endoflife></endoflife>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:opensuse-tumbleweed-kubic:20181026</cpeid>
+ <cpeid>cpe:/o:opensuse:opensuse-tumbleweed-kubic:20181029</cpeid>
<productline>openSUSE-Tumbleweed-Kubic</productline>
<register>
<pool>
++++++ _service:product_converter:openSUSE-cd-mini-i586.kiwi ++++++
--- /var/tmp/diff_new_pack.eH9IQQ/_old 2018-10-29 14:59:07.846035443 +0100
+++ /var/tmp/diff_new_pack.eH9IQQ/_new 2018-10-29 14:59:07.846035443 +0100
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20181026" schemaversion="4.1">
+<image name="OBS__openSUSE___20181029" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -32,9 +32,9 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20181026</productvar>
+ <productvar name="VERSION">20181029</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20181026,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20181029,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
_service:product_converter:openSUSE-cd-mini-x86_64.kiwi: same change
_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi: same change
_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi: same change
++++++ _service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.eH9IQQ/_old 2018-10-29 14:59:07.906035506 +0100
+++ /var/tmp/diff_new_pack.eH9IQQ/_new 2018-10-29 14:59:07.906035506 +0100
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20181026" schemaversion="4.1">
+<image name="OBS__openSUSE___20181029" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -24,7 +24,7 @@
<productvar name="DISTNAME">openSUSE</productvar>
<productvar name="FLAVOR">ftp</productvar>
<productvar name="MAKE_LISTINGS">true</productvar>
- <productvar name="MEDIUM_NAME">openSUSE-20181026-i586-x86_64</productvar>
+ <productvar name="MEDIUM_NAME">openSUSE-20181029-i586-x86_64</productvar>
<productvar name="MULTIPLE_MEDIA">true</productvar>
<productvar name="PRODUCT_DIR">/</productvar>
<productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar>
@@ -36,9 +36,9 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20181026</productvar>
+ <productvar name="VERSION">20181029</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20181026,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20181029,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="DEBUGMEDIUM">2</productoption>
++++++ _service:product_converter:openSUSE-release.spec ++++++
--- /var/tmp/diff_new_pack.eH9IQQ/_old 2018-10-29 14:59:07.934035536 +0100
+++ /var/tmp/diff_new_pack.eH9IQQ/_new 2018-10-29 14:59:07.958035561 +0100
@@ -20,7 +20,7 @@
#define betaversion %{nil}
%define codename Tumbleweed
Name: openSUSE-release
-Version: 20181026
+Version: 20181029
Release: 0
# 0 is the product release, not the build release of this package
Summary: openSUSE Tumbleweed
@@ -51,7 +51,7 @@
Obsoletes: aaa_version
Obsoletes: openSUSE-Promo-release <= 11.1
Obsoletes: openSUSE-release-live <= 11.0
-Obsoletes: product_flavor(%{product}) < 20181026
+Obsoletes: product_flavor(%{product}) < 20181029
# bnc#826592
Provides: weakremover(kernel-default) < 3.11
Provides: weakremover(kernel-desktop) < 4.2
@@ -61,7 +61,7 @@
Provides: weakremover(kernel-xen) < 3.11
Provides: %name-%version
Provides: product() = openSUSE
-Provides: product(openSUSE) = 20181026-0
+Provides: product(openSUSE) = 20181029-0
%ifarch x86_64
Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64
%endif
@@ -75,7 +75,7 @@
Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64
%endif
Provides: product-label() = openSUSE
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20181026
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20181029
Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F
Requires: product_flavor(openSUSE)
@@ -17485,7 +17485,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(ftp)
-Provides: product_flavor(openSUSE) = 20181026-0
+Provides: product_flavor(openSUSE) = 20181029-0
Summary: openSUSE Tumbleweed
%description ftp
@@ -17500,7 +17500,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(mini)
-Provides: product_flavor(openSUSE) = 20181026-0
+Provides: product_flavor(openSUSE) = 20181029-0
Summary: openSUSE Tumbleweed
%description mini
@@ -17515,7 +17515,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(dvd)
-Provides: product_flavor(openSUSE) = 20181026-0
+Provides: product_flavor(openSUSE) = 20181029-0
Summary: openSUSE Tumbleweed
%description dvd
@@ -17530,7 +17530,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-kde)
-Provides: product_flavor(openSUSE) = 20181026-0
+Provides: product_flavor(openSUSE) = 20181029-0
Summary: openSUSE Tumbleweed
%description livecd-kde
@@ -17545,7 +17545,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-x11)
-Provides: product_flavor(openSUSE) = 20181026-0
+Provides: product_flavor(openSUSE) = 20181029-0
Summary: openSUSE Tumbleweed
%description livecd-x11
@@ -17560,7 +17560,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-gnome)
-Provides: product_flavor(openSUSE) = 20181026-0
+Provides: product_flavor(openSUSE) = 20181029-0
Summary: openSUSE Tumbleweed
%description livecd-gnome
@@ -17575,7 +17575,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-kde)
-Provides: product_flavor(openSUSE) = 20181026-0
+Provides: product_flavor(openSUSE) = 20181029-0
Summary: openSUSE Tumbleweed
%description usb-kde
@@ -17590,7 +17590,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-gnome)
-Provides: product_flavor(openSUSE) = 20181026-0
+Provides: product_flavor(openSUSE) = 20181029-0
Summary: openSUSE Tumbleweed
%description usb-gnome
@@ -17605,7 +17605,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-x11)
-Provides: product_flavor(openSUSE) = 20181026-0
+Provides: product_flavor(openSUSE) = 20181029-0
Summary: openSUSE Tumbleweed
%description usb-x11
@@ -17678,10 +17678,10 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>openSUSE</name>
- <version>20181026</version>
+ <version>20181029</version>
<release>0</release>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:opensuse:20181026</cpeid>
+ <cpeid>cpe:/o:opensuse:opensuse:20181029</cpeid>
<productline>openSUSE</productline>
<register>
<pool>
openSUSE-release.spec: same change
++++++ openSUSE-Tumbleweed-Kubic.product ++++++
--- /var/tmp/diff_new_pack.eH9IQQ/_old 2018-10-29 14:59:08.242035858 +0100
+++ /var/tmp/diff_new_pack.eH9IQQ/_new 2018-10-29 14:59:08.242035858 +0100
@@ -6,7 +6,7 @@
<name>openSUSE-Tumbleweed-Kubic</name>
<releasepkgname>openSUSE-Tumbleweed-Kubic-release</releasepkgname>
<endoflife/>
- <version>20181026</version>
+ <version>20181029</version>
<!-- release is no longer optional -->
<release>0</release>
<productline>openSUSE-Tumbleweed-Kubic</productline>
++++++ openSUSE.product ++++++
--- /var/tmp/diff_new_pack.eH9IQQ/_old 2018-10-29 14:59:08.262035879 +0100
+++ /var/tmp/diff_new_pack.eH9IQQ/_new 2018-10-29 14:59:08.262035879 +0100
@@ -4,7 +4,7 @@
<product>
<vendor>openSUSE</vendor>
<name>openSUSE</name>
- <version>20181026</version>
+ <version>20181029</version>
<release>0</release>
<productline>openSUSE</productline>
1
0
Hello community,
here is the log from the commit of package gnome-subtitles for openSUSE:Factory checked in at 2018-10-29 14:23:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-subtitles (Old)
and /work/SRC/openSUSE:Factory/.gnome-subtitles.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-subtitles"
Mon Oct 29 14:23:25 2018 rev:17 rq:645245 version:1.4.1+12
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-subtitles/gnome-subtitles.changes 2018-06-29 22:25:41.922515365 +0200
+++ /work/SRC/openSUSE:Factory/.gnome-subtitles.new/gnome-subtitles.changes 2018-10-29 14:59:05.290032691 +0100
@@ -1,0 +2,25 @@
+Mon Oct 29 11:29:14 UTC 2018 - dimstar(a)opensuse.org
+
+- Update to version 1.4.1+12:
+ + Don't write UTF-8 files with BOM.
+ + Fix #112 - negative time shift not work.
+ + Updating autogen.sh file for yelp-tools use.
+ + Updating gitignore+NEWS files for yelp-tools use.
+ + Port help to yelp-tools.
+ + Default number column width is now 4 chars.
+ + Fixed #3 - System freezes when using v 1.4.
+ + Fix keywords in Icelandic translation.
+ + Updating AppStream and Desktop files.
+ + Fix Keywords in Romanian translation.
+ + Fixed copy/cut buttons' sensitivity.
+ + Updating dependencies.
+ + Updating build configuration..
+ + Unmark strings from translation that shouldn’t be translatable.
+ + Minor UI changes.
+ + Switched to gtksink to display gstreamer video.
+ + Updating Makefiles for new GtkSpell code.
+ + Updated README file dependencies and other info.
+ + GtkSpell upgraded to 3.0 and code refactor.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
gnome-subtitles-1.3+142.tar.xz
New:
----
gnome-subtitles-1.4.1+12.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-subtitles.spec ++++++
--- /var/tmp/diff_new_pack.cwt0hh/_old 2018-10-29 14:59:05.910033370 +0100
+++ /var/tmp/diff_new_pack.cwt0hh/_new 2018-10-29 14:59:05.910033370 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -20,7 +20,7 @@
%bcond_without from_git
%endif
Name: gnome-subtitles
-Version: 1.3+142
+Version: 1.4.1+12
Release: 0
Summary: Subtitle editor for GNOME
License: GPL-2.0-or-later
@@ -28,7 +28,7 @@
URL: http://gnome-subtitles.sourceforge.net
Source0: %{name}-%{version}.tar.xz
BuildRequires: fdupes
-BuildRequires: intltool
+BuildRequires: intltool >= 0.50
BuildRequires: pkgconfig
BuildRequires: translation-update-upstream
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) >= 1.0
@@ -76,7 +76,6 @@
%make_install
find %{buildroot}%{_libdir} -type f -name "*.la" -delete
%find_lang %{name} %{?no_lang_C}
-#fdupes %{buildroot}
%if 0%{?suse_version} < 1330
%post
@@ -89,20 +88,14 @@
%files
%license COPYING
%doc AUTHORS ChangeLog NEWS README
-%dir %{_datadir}/gnome/
-%dir %{_datadir}/gnome/help/
-%dir %{_datadir}/gnome/help/%{name}/
-%doc %{_datadir}/gnome/help/%{name}/C/
-%dir %{_datadir}/omf/
-%dir %{_datadir}/omf/%{name}/
-%doc %{_datadir}/omf/%{name}/%{name}-C.omf
%{_bindir}/%{name}
%{_libdir}/%{name}/
-%{_datadir}/applications/%{name}.desktop
%{_mandir}/man1/gnome-subtitles.1%{ext_man}
%{_datadir}/pixmaps/gnome-subtitles.svg
-%{_datadir}/appdata/gnome-subtitles.appdata.xml
%{_datadir}/glib-2.0/schemas/org.gnome.GnomeSubtitles.gschema.xml
+%{_datadir}/applications/org.gnome.GnomeSubtitles.desktop
+%{_datadir}/help/C/gnome-subtitles/
+%{_datadir}/metainfo/org.gnome.GnomeSubtitles.appdata.xml
%files lang -f %{name}.lang
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.cwt0hh/_old 2018-10-29 14:59:05.946033409 +0100
+++ /var/tmp/diff_new_pack.cwt0hh/_new 2018-10-29 14:59:05.946033409 +0100
@@ -3,4 +3,4 @@
<param name="url">https://github.com/hughsie/appstream-glib.git</param>
<param name="changesrevision">4e30302953a7e7b89c57b717e2aa0096c17ac166</param></service><service name="tar_scm">
<param name="url">https://gitlab.gnome.org/GNOME/gnome-subtitles.git</param>
- <param name="changesrevision">f7562a20514322acb642ba7814af5eda08a4d029</param></service></servicedata>
\ No newline at end of file
+ <param name="changesrevision">7ab2a4de3cbe726b831ea817cfa53da643087b01</param></service></servicedata>
\ No newline at end of file
++++++ gnome-subtitles-1.3+142.tar.xz -> gnome-subtitles-1.4.1+12.tar.xz ++++++
++++ 22861 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package peazip for openSUSE:Factory checked in at 2018-10-29 14:23:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/peazip (Old)
and /work/SRC/openSUSE:Factory/.peazip.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "peazip"
Mon Oct 29 14:23:06 2018 rev:5 rq:645199 version:6.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/peazip/peazip.changes 2018-06-13 15:39:57.807295187 +0200
+++ /work/SRC/openSUSE:Factory/.peazip.new/peazip.changes 2018-10-29 14:59:04.306031602 +0100
@@ -1,0 +2,9 @@
+Sun Oct 28 18:21:09 UTC 2018 - Luigi Baldoni <aloisio(a)gmx.com>
+
+- Update to version 6.6.1
+ * various improvements and fixes
+ * it is now possible to force batch extraction of unsupported
+ file types with PeaZip (or other custom executable), and to
+ set a custom directory as working path.
+
+-------------------------------------------------------------------
Old:
----
peazip-6.6.0.src.zip
New:
----
peazip-6.6.1.src.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ peazip.spec ++++++
--- /var/tmp/diff_new_pack.07fAqc/_old 2018-10-29 14:59:04.950032318 +0100
+++ /var/tmp/diff_new_pack.07fAqc/_new 2018-10-29 14:59:04.954032323 +0100
@@ -12,18 +12,18 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define _peazipinstalldir %{_libdir}/peazip
Name: peazip
-Version: 6.6.0
+Version: 6.6.1
Release: 0
Summary: Graphical file archiver
License: LGPL-3.0-only
Group: Productivity/Archiving/Compression
-Url: http://www.peazip.org
+URL: http://www.peazip.org
Source0: https://sourceforge.net/projects/peazip/files/%{version}/peazip-%{version}.…
Source1: altconf.txt
Source2: https://sourceforge.net/projects/peazip/files/%{version}/peazip_help.pdf
@@ -40,7 +40,6 @@
BuildRequires: fpc-src
BuildRequires: kf5-filesystem
BuildRequires: lazarus
-BuildRequires: libQt5Pas-devel
BuildRequires: unzip
BuildRequires: upx
%if 0%{?suse_version} > 1500
@@ -98,6 +97,7 @@
--cpu=x86_64 \
%endif
--widgetset=gtk2 \
+ --max-process-count=1 \
-B project_pea.lpi project_peach.lpi project_gwrap.lpi
%install
@@ -137,13 +137,14 @@
%endif
%files
+%license copying.txt
+%doc readme peazip_help.pdf
%{_bindir}/pea
%{_bindir}/pealauncher
%{_bindir}/peazip
%{_peazipinstalldir}
%{_datadir}/applications/peazip.desktop
%{_datadir}/pixmaps/peazip.png
-%doc readme copying.txt peazip_help.pdf
%files kf5
%dir %{_kf5_servicesdir}/ServiceMenus
++++++ peazip_help.pdf ++++++
(binary differes)
1
0
Hello community,
here is the log from the commit of package gsequencer for openSUSE:Factory checked in at 2018-10-29 14:23:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gsequencer (Old)
and /work/SRC/openSUSE:Factory/.gsequencer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gsequencer"
Mon Oct 29 14:23:03 2018 rev:24 rq:645179 version:2.0.37
Changes:
--------
--- /work/SRC/openSUSE:Factory/gsequencer/gsequencer.changes 2018-10-15 09:45:27.267236356 +0200
+++ /work/SRC/openSUSE:Factory/.gsequencer.new/gsequencer.changes 2018-10-29 14:59:02.734029827 +0100
@@ -1,0 +2,11 @@
+Sat Oct 27 19:58:26 UTC 2018 - Joël Krähemann <jkraehemann(a)gmail.com>
+
+- new upstream v2.0.37 implemented missing code of
+ AgsIpatchGigReader and AgsIpatchDLS2Reader as well
+ ags_char_buffer_util.c. Minor improvements and bug-fixes.
+- Edited spec file to run functional tests which are optional, now.
+- Added missing ags/config.h in installation include directory.
+- Added gsequencer.1-fix-configure-ac.patch because configure
+ option was broken.
+
+-------------------------------------------------------------------
Old:
----
gsequencer-2.0.35.tar.gz
New:
----
gsequencer-2.0.37.tar.gz
gsequencer.1-fix-configure-ac.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gsequencer.spec ++++++
--- /var/tmp/diff_new_pack.wBzUIQ/_old 2018-10-29 14:59:03.342030519 +0100
+++ /var/tmp/diff_new_pack.wBzUIQ/_new 2018-10-29 14:59:03.346030524 +0100
@@ -18,7 +18,7 @@
%define libagssonumber 2
%define libgsequencersonumber 0
Name: gsequencer
-Version: 2.0.35
+Version: 2.0.37
Release: 0
Summary: Audio processing engine
License: GPL-3.0+ AND AGPL-3.0+ AND GFDL-1.3
@@ -27,6 +27,7 @@
Source0: https://download.savannah.gnu.org/releases/gsequencer/2.0.x/%{name}-%{versi…
# PATCH-FIX-OPENSUSE gsequencer.0-fix-makefile-am.patch -- fix opensuse specific locations
Patch0: gsequencer.0-fix-makefile-am.patch
+Patch1: gsequencer.1-fix-configure-ac.patch
BuildRequires: fluid-soundfont-gm
BuildRequires: hydrogen
BuildRequires: cunit-devel
@@ -66,11 +67,12 @@
%prep
%setup -q
%patch0
+%patch1
%build
autoreconf -fi
export CPPFLAGS='-DAGS_RC_FILENAME=\"'%{_datadir}'/gsequencer/styles/ags.rc\" -DAGS_ANIMATION_FILENAME=\"'%{_datadir}'/gsequencer/images/ags_supermoon-800x450.png\" -DAGS_LOGO_FILENAME=\"'%{_datadir}'/gsequencer/images/ags.png\" -DAGS_LICENSE_FILENAME=\"'%{_datadir}'/licenses/gsequencer/COPYING\"'
-%configure --disable-oss --enable-gtk-doc --enable-gtk-doc-html
+%configure --enable-run-functional-tests --disable-oss --enable-gtk-doc --enable-gtk-doc-html
%make_build all
%make_build html
++++++ gsequencer-2.0.35.tar.gz -> gsequencer-2.0.37.tar.gz ++++++
++++ 19357 lines of diff (skipped)
++++++ gsequencer.0-fix-makefile-am.patch ++++++
--- /var/tmp/diff_new_pack.wBzUIQ/_old 2018-10-29 14:59:04.078031348 +0100
+++ /var/tmp/diff_new_pack.wBzUIQ/_new 2018-10-29 14:59:04.078031348 +0100
@@ -1,6 +1,6 @@
---- Makefile.am.orig 2018-09-26 00:25:27.053043925 +0200
-+++ Makefile.am 2018-09-26 00:31:42.637586973 +0200
-@@ -31,12 +31,12 @@
+--- Makefile.am.orig 2018-10-27 16:08:41.000000000 +0200
++++ Makefile.am 2018-10-27 21:41:22.922367876 +0200
+@@ -35,12 +35,12 @@
# this lists the binaries to produce, the (non-PHONY, binary) targets in
# the previous manual Makefile
lib_LTLIBRARIES = libags.la libags_thread.la libags_server.la libags_audio.la libags_gui.la
@@ -16,7 +16,7 @@
EXTRA_DIST = config.rpath \
COPYING.server \
-@@ -109,7 +109,7 @@
+@@ -114,7 +114,7 @@
# pkg-config
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libags.pc libags_audio.pc libags_gui.pc
@@ -25,7 +25,7 @@
EXTRA_DIST += libags.pc.in libags_audio.pc.in libags_gui.pc.in libgsequencer.pc.in
# EXTRA_DIST += libgsequencer.pc.in
-@@ -148,7 +148,7 @@
+@@ -153,7 +153,7 @@
# include
otherincludedir = $(includedir)/ags
nobase_include_HEADERS = $(libags_la_HEADERS_0) $(libags_thread_la_HEADERS_0) $(libags_server_la_HEADERS_0) $(libags_audio_la_HEADERS_0) $(libags_gui_la_HEADERS_0)
@@ -34,7 +34,7 @@
# doc
# docdir = $(datadir)/doc/gsequencer
-@@ -1924,8 +1924,8 @@
+@@ -1959,8 +1959,8 @@
html:
mkdir -p $(top_builddir)/html/
mkdir -p $(top_builddir)/html/{developer-docs,user-docs}
@@ -45,7 +45,7 @@
$(MAKE) -C $(top_srcdir)/docs/reference/libags
cd $(top_srcdir)
$(MAKE) -C $(top_srcdir)/docs/reference/libags-audio
-@@ -1956,18 +1956,18 @@
+@@ -1993,18 +1993,18 @@
gzip -9 -c $(top_srcdir)/ChangeLog > $(DESTDIR)/$(docdir)/changelog.gz
fix-local-html: html
@@ -76,7 +76,7 @@
fix-online-books-html: html
find $(top_srcdir)/html/ -name "*.html" -type f -exec sed -i 's/\/usr\/share\/icons\/Adwaita\/32x32\/actions/..\/images/g' {} \;
-@@ -1994,19 +1994,11 @@
+@@ -2031,19 +2031,11 @@
install -c -p -m 644 $(devdocimages) $(DESTDIR)/$(datadir)/doc/libags-audio-doc/images/
install -c -p -m 644 $(top_builddir)/html/user-docs/* $(DESTDIR)/$(docdir)/html/
install -c -p -m 644 $(top_builddir)/html/developer-docs/* $(DESTDIR)/$(datadir)/doc/libags-audio-doc/html/
@@ -100,4 +100,4 @@
+ install -c -p -m 644 $(top_srcdir)/docs/reference/libgsequencer/libgsequencer-html/* $(DESTDIR)/$(datadir)/gtk-doc/html/libgsequencer
uninstall-hook:
- rm -rf $(DESTDIR)/$(datadir)/gsequencer
+ rm -rf $(DESTDIR)/$(includedir)/ags/config.h
++++++ gsequencer.1-fix-configure-ac.patch ++++++
--- configure.ac.orig 2018-10-27 21:56:34.346074761 +0200
+++ configure.ac 2018-10-27 21:56:12.621801938 +0200
@@ -19,10 +19,10 @@
AM_GNU_GETTEXT_VERSION([0.19.7])
# options
-AC_ARG_ENABLE(rt, [AS_HELP_STRING([--strip-rt-events],
+AC_ARG_ENABLE(strip-rt-events, [AS_HELP_STRING([--enable-strip-rt-events],
[strip rt events (default is yes)])],
[],
- [strip_rt_events=yes])
+ [enable_strip_rt_events=yes])
AC_ARG_ENABLE(rt, [AS_HELP_STRING([--enable-rt],
[enable rt (default is yes)])],
@@ -69,10 +69,10 @@
[],
[enable_quartz=no])
-AC_ARG_ENABLE(rt, [AS_HELP_STRING([--run-functional-tests],
+AC_ARG_ENABLE(run-functional-tests, [AS_HELP_STRING([--enable-run-functional-tests],
[run functional tests (default is no)])],
[],
- [run_functional_tests=no])
+ [enable_run_functional_tests=no])
# Checks for programs.
AC_PROG_CC
@@ -114,7 +114,7 @@
# FIXME: Replace `main' with a function in `-lm':
AC_CHECK_LIB([m], [main], , AC_MSG_ERROR("No math library present"))
-AS_IF([test "x$strip_rt_events" != xno],
+AS_IF([test "x$enable_strip_rt_events" != xno],
[AC_DEFINE([AGS_STRIP_RT_EVENTS], [1], [striping rt-events enabled])
AC_MSG_NOTICE([striping rt-events enabled])],
[AC_MSG_NOTICE([striping rt-events disabled])
@@ -281,10 +281,10 @@
AC_DEFINE([AGS_WITH_XMLRPC_C], [1], [Disable if you don't want xmlrpc-c])],
AC_MSG_NOTICE([xmlrpc-c disabled]))
-AS_IF([test "x$run_functional_tests" == xyes],
+AS_IF([test "x$enable_run_functional_tests" == xyes],
[AC_MSG_NOTICE([run functional tests enabled])],
AC_MSG_NOTICE([run functional tests disabled]))
-AM_CONDITIONAL([RUN_FUNCTIONAL_TESTS], [test "x$run_functional_tests" == xyes])
+AM_CONDITIONAL([RUN_FUNCTIONAL_TESTS], [test "x$enable_run_functional_tests" == xyes])
# Checks for library functions.
AC_FUNC_MALLOC
1
0