Hello community, here is the log from the commit of package python-tooz for openSUSE:Factory checked in at 2019-05-03 22:46:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-tooz (Old) and /work/SRC/openSUSE:Factory/.python-tooz.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-tooz" Fri May 3 22:46:29 2019 rev:9 rq:699141 version:1.64.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-tooz/python-tooz.changes 2019-03-26 15:44:53.904116336 +0100 +++ /work/SRC/openSUSE:Factory/.python-tooz.new.5148/python-tooz.changes 2019-05-03 22:46:30.643780806 +0200 @@ -1,0 +2,27 @@ +Mon Apr 29 06:01:18 UTC 2019 - Dirk Mueller <dmuel...@suse.com> + +- fix python-enum34 dependency + +------------------------------------------------------------------- +Mon Apr 8 14:02:40 UTC 2019 - cloud-de...@suse.de + +- update to version 1.64.2 + - More explicitly document driver connection strings + - fix tox python3 overrides + - Ensure consistent encoding of strings for ID + - Add release note link in README + - add lib-forward-testing-python3 test job + - Change openstack-dev to openstack-discuss + - Unblock tooz gate + - Update reno for stable/rocky + - Fixed UnicodeEncodeError for Python2 unicode objects + - Switch to autodoc_default_options + - Migrate to stestr + - add python 3.6 unit test job + - Use templates for cover + - Fix coverage tests + - import zuul job settings from project-config + - coordination: do not retry the whole heartbeat on fail +- add 0001-Remove-grpcio-from-requirements.txt.patch + +------------------------------------------------------------------- Old: ---- tooz-1.62.1.tar.gz New: ---- 0001-Remove-grpcio-from-requirements.txt.patch tooz-1.64.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-tooz.spec ++++++ --- /var/tmp/diff_new_pack.xXJMeS/_old 2019-05-03 22:46:32.099784149 +0200 +++ /var/tmp/diff_new_pack.xXJMeS/_new 2019-05-03 22:46:32.123784204 +0200 @@ -16,43 +16,56 @@ # -%global pypi_name tooz %if 0%{?rhel} || 0%{?fedora} %global rdo 1 %endif Name: python-tooz -Version: 1.62.1 +Version: 1.64.2 Release: 0 Summary: Coordination library for distributed systems License: Apache-2.0 Group: Development/Languages/Python URL: https://docs.openstack.org/developer/tooz/ -Source0: https://files.pythonhosted.org/packages/source/t/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +Source0: https://files.pythonhosted.org/packages/source/t/tooz/tooz-1.64.2.tar.gz +# https://review.openstack.org/#/c/640695/ +Patch1: 0001-Remove-grpcio-from-requirements.txt.patch BuildRequires: memcached BuildRequires: openstack-macros -BuildRequires: python-devel -BuildRequires: python-enum34 -BuildRequires: python-fasteners >= 0.7 -BuildRequires: python-fixtures -BuildRequires: python-futures >= 3.0 -BuildRequires: python-futurist >= 0.11.0 -BuildRequires: python-iso8601 -BuildRequires: python-mock -BuildRequires: python-oslo.serialization >= 1.10.0 -BuildRequires: python-oslo.utils >= 3.15.0 -BuildRequires: python-pbr >= 1.6 -BuildRequires: python-pifpaf -BuildRequires: python-pymemcache -BuildRequires: python-setuptools -BuildRequires: python-stevedore >= 1.16.0 -BuildRequires: python-tenacity >= 3.2.1 -BuildRequires: python-testtools -BuildRequires: python-voluptuous >= 0.8.9 +BuildRequires: python2-enum34 >= 1.0.4 +BuildRequires: python2-fasteners >= 0.7 +BuildRequires: python2-fixtures +BuildRequires: python2-futures >= 3.0 +BuildRequires: python2-futurist >= 1.2.0 +BuildRequires: python2-iso8601 +BuildRequires: python2-mock +BuildRequires: python2-oslo.serialization >= 1.10.0 +BuildRequires: python2-oslo.utils >= 3.15.0 +BuildRequires: python2-pbr >= 1.6 +BuildRequires: python2-pifpaf +BuildRequires: python2-pymemcache +BuildRequires: python2-setuptools +BuildRequires: python2-stevedore >= 1.16.0 +BuildRequires: python2-tenacity >= 3.2.1 +BuildRequires: python2-testtools +BuildRequires: python2-voluptuous >= 0.8.9 +BuildRequires: python3-fasteners >= 0.7 +BuildRequires: python3-fixtures +BuildRequires: python3-futurist >= 1.2.0 +BuildRequires: python3-iso8601 +BuildRequires: python3-mock +BuildRequires: python3-oslo.serialization >= 1.10.0 +BuildRequires: python3-oslo.utils >= 3.15.0 +BuildRequires: python3-pbr >= 1.6 +BuildRequires: python3-pifpaf +BuildRequires: python3-pymemcache +BuildRequires: python3-setuptools +BuildRequires: python3-stevedore >= 1.16.0 +BuildRequires: python3-tenacity >= 3.2.1 +BuildRequires: python3-testtools +BuildRequires: python3-voluptuous >= 0.8.9 Requires: python-Babel -Requires: python-enum34 Requires: python-fasteners >= 0.7 -Requires: python-futures >= 3.0 -Requires: python-futurist >= 0.11.0 +Requires: python-futurist >= 1.2.0 Requires: python-iso8601 Requires: python-msgpack >= 0.4.0 Requires: python-oslo.serialization >= 1.10.0 @@ -61,22 +74,25 @@ Requires: python-stevedore >= 1.16.0 Requires: python-tenacity >= 3.2.1 Requires: python-voluptuous >= 0.8.9 -Requires: python-zake BuildArch: noarch +%ifpython2 +Requires: python-enum34 >= 1.0.4 +Requires: python-futures >= 3.0 +%endif +%python_subpackages %description The Tooz project aims at centralizing the most common distributed primitives like group membership protocol, lock service and leader election by providing a coordination API helping developers to build distributed applications. -%package doc +%package -n python-tooz-doc Summary: Documentation for %{name} Group: Documentation/HTML BuildRequires: python-Sphinx BuildRequires: python-openstackdocstheme -BuildRequires: python-redis -%description doc +%description -n python-tooz-doc The Tooz project aims at centralizing the most common distributed primitives like group membership protocol, lock service and leader election by providing a coordination API helping developers to build distributed applications. @@ -84,36 +100,36 @@ This package contains documentation in HTML format. %prep -%autosetup -n %{pypi_name}-%{version} +%autosetup -p1 -n tooz-1.64.2 %py_req_cleanup -sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg %build -%py2_build +%{python_build} # generate html docs -%{__python2} setup.py build_sphinx +PYTHONPATH=. \ + sphinx-build -b html doc/source doc/build/html # remove the Sphinx-build leftovers -rm -rf build/sphinx/html/.{doctrees,buildinfo} +rm -rf doc/build/html/.{doctrees,buildinfo} %check %if ! 0%{?rdo} export TOOZ_TEST_DRIVERS="memcached" export PATH=%{_prefix}/sbin:$PATH +export LC_ALL=en_US.UTF-8 bash run-tests.sh %endif %install -%py2_install +%{python_install} -%files +%files %{python_files} %license LICENSE -%doc README.rst -%{python2_sitelib}/%{pypi_name} -%{python2_sitelib}/%{pypi_name}-*.egg-info +%{python_sitelib}/tooz +%{python_sitelib}/tooz-*.egg-info -%files doc +%files -n python-tooz-doc %license LICENSE -%doc build/sphinx/html +%doc doc/build/html README.rst %changelog ++++++ 0001-Remove-grpcio-from-requirements.txt.patch ++++++ >From 9c2807281be01c28643471ebe9f9ef3d40b4c2c5 Mon Sep 17 00:00:00 2001 From: Thomas Bechtold <tbecht...@suse.com> Date: Mon, 4 Mar 2019 10:17:07 +0100 Subject: [PATCH] Remove grpcio from requirements.txt It is not used anywhere. Change-Id: I0a0215f56b37d9a4286097b7f748f68d59afcb35 --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b2aee6d..1af5228 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,4 +13,3 @@ futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD futurist>=1.2.0 # Apache-2.0 oslo.utils>=3.15.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 -grpcio>=1.0.0,<1.16.0 -- 2.21.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.xXJMeS/_old 2019-05-03 22:46:32.507785085 +0200 +++ /var/tmp/diff_new_pack.xXJMeS/_new 2019-05-03 22:46:32.507785085 +0200 @@ -1,8 +1,8 @@ <services> <service mode="disabled" name="renderspec"> - <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/rocky/openstack/tooz/tooz.spec.j2</param> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/stein/openstack/tooz/tooz.spec.j2</param> <param name="output-name">python-tooz.spec</param> - <param name="requirements">https://raw.githubusercontent.com/openstack/tooz/stable/rocky/requirements.txt</param> + <param name="requirements">https://raw.githubusercontent.com/openstack/tooz/stable/stein/requirements.txt</param> <param name="changelog-email">cloud-de...@suse.de</param> <param name="changelog-provider">gh,openstack,tooz</param> </service> ++++++ tooz-1.62.1.tar.gz -> tooz-1.64.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/.coveragerc new/tooz-1.64.2/.coveragerc --- old/tooz-1.62.1/.coveragerc 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/.coveragerc 2019-02-26 01:17:24.000000000 +0100 @@ -1,7 +1,7 @@ [run] branch = True source = tooz -omit = tooz/tests/*,tooz/openstack/* +omit = tooz/tests/* [report] ignore_errors = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/.stestr.conf new/tooz-1.64.2/.stestr.conf --- old/tooz-1.62.1/.stestr.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/tooz-1.64.2/.stestr.conf 2019-02-26 01:17:24.000000000 +0100 @@ -0,0 +1,2 @@ +[DEFAULT] +test_path=tooz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/.testr.conf new/tooz-1.64.2/.testr.conf --- old/tooz-1.62.1/.testr.conf 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/.testr.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -[DEFAULT] -test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ - OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ - OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-160} \ - OS_DEBUG=${OS_DEBUG:-TRACE} \ - OS_LOG_CAPTURE=${OS_LOG_CAPTURE:-1} \ - ${PYTHON:-python} -m subunit.run discover tooz $LISTOPT $IDOPTION -test_id_option=--load-list $IDFILE -test_list_option=--list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/.zuul.yaml new/tooz-1.64.2/.zuul.yaml --- old/tooz-1.62.1/.zuul.yaml 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/.zuul.yaml 2019-02-26 01:17:24.000000000 +0100 @@ -1,84 +1,60 @@ - project: + templates: + - check-requirements + - lib-forward-testing + - lib-forward-testing-python3 + - openstack-cover-jobs + - openstack-python-jobs + - openstack-python35-jobs + - openstack-python36-jobs + - periodic-stable-jobs + - publish-openstack-docs-pti + - release-notes-jobs-python3 check: jobs: - tooz-tox-py27-etcd - - tooz-tox-py35-etcd: - branches: ^(?!stable/newton).*$ - - tooz-tox-py27-etcd3: - branches: ^(?!stable/(newton|ocata)).*$ - - tooz-tox-py35-etcd3: - branches: ^(?!stable/(newton|ocata)).*$ - - tooz-tox-py27-etcd3gw: - branches: ^(?!stable/(newton|ocata)).*$ - - tooz-tox-py35-etcd3gw: - branches: ^(?!stable/(newton|ocata)).*$ + - tooz-tox-py35-etcd + - tooz-tox-py27-etcd3 + - tooz-tox-py35-etcd3 + - tooz-tox-py27-etcd3gw + - tooz-tox-py35-etcd3gw - tooz-tox-py27-zookeeper - - tooz-tox-py35-zookeeper: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-zookeeper - tooz-tox-py27-redis - - tooz-tox-py35-redis: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-redis - tooz-tox-py27-sentinel - - tooz-tox-py35-sentinel: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-sentinel - tooz-tox-py27-memcached - - tooz-tox-py35-memcached: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-memcached - tooz-tox-py27-postgresql - - tooz-tox-py35-postgresql: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-postgresql - tooz-tox-py27-mysql - - tooz-tox-py35-mysql: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-mysql - tooz-tox-py27-consul - - tooz-tox-py35-consul: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-consul gate: jobs: - tooz-tox-py27-etcd - - tooz-tox-py35-etcd: - branches: ^(?!stable/newton).*$ - - tooz-tox-py27-etcd3: - branches: ^(?!stable/(newton|ocata)).*$ - - tooz-tox-py35-etcd3: - branches: ^(?!stable/(newton|ocata)).*$ - - tooz-tox-py27-etcd3gw: - branches: ^(?!stable/(newton|ocata)).*$ - - tooz-tox-py35-etcd3gw: - branches: ^(?!stable/(newton|ocata)).*$ + - tooz-tox-py35-etcd + - tooz-tox-py27-etcd3 + - tooz-tox-py35-etcd3 + - tooz-tox-py27-etcd3gw + - tooz-tox-py35-etcd3gw - tooz-tox-py27-zookeeper - - tooz-tox-py35-zookeeper: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-zookeeper - tooz-tox-py27-redis - - tooz-tox-py35-redis: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-redis - tooz-tox-py27-sentinel - - tooz-tox-py35-sentinel: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-sentinel - tooz-tox-py27-memcached - - tooz-tox-py35-memcached: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-memcached - tooz-tox-py27-postgresql - - tooz-tox-py35-postgresql: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-postgresql - tooz-tox-py27-mysql - - tooz-tox-py35-mysql: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-mysql - tooz-tox-py27-consul - - tooz-tox-py35-consul: - branches: ^(?!stable/newton).*$ + - tooz-tox-py35-consul - templates: - - check-requirements - - openstack-python-jobs - - openstack-python35-jobs - - publish-openstack-docs-pti - - lib-forward-testing - - release-notes-jobs-python3 - - periodic-stable-jobs - post: - jobs: - - openstack-tox-cover - job: name: tooz-tox-py27-consul parent: openstack-tox diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/AUTHORS new/tooz-1.64.2/AUTHORS --- old/tooz-1.62.1/AUTHORS 2019-03-18 00:11:02.000000000 +0100 +++ new/tooz-1.64.2/AUTHORS 2019-02-26 01:18:41.000000000 +0100 @@ -2,6 +2,7 @@ Adam Gandelman <ad...@ubuntu.com> Akihiro Motoki <amot...@gmail.com> Andreas Jaeger <a...@suse.com> +Ben Nemec <bne...@redhat.com> Cao Xuan Hoang <hoan...@vn.fujitsu.com> ChangBo Guo(gcb) <eric....@easystack.cn> Chris Dent <chd...@redhat.com> @@ -18,6 +19,7 @@ Hoang Trung Hieu <hie...@vn.fujitsu.com> Imran Ansari <imran.ans...@hpe.com> James E. Blair <jebl...@redhat.com> +James Page <james.p...@ubuntu.com> Jay Clark <jason.t.cl...@hp.com> Jay Pipes <jaypi...@gmail.com> Jeremy Stanley <fu...@yuggoth.org> @@ -45,6 +47,7 @@ Tony Breeds <t...@bakeyournoodle.com> Victor Morales <victor.mora...@intel.com> Vilobh Meshram <vilob...@yahoo-inc.com> +XiaojueGuan <guanalbertj...@gmail.com> Yassine Lamgarchal <yassine.lamgarc...@enovance.com> Yassine Lamgarchal <yassine.lamgarc...@redhat.com> fuzk <f...@inspur.com> @@ -53,6 +56,7 @@ howardlee <lihongwe...@inspur.com> lahoucine BENLAHMR <lahouc...@benlahmr.com> liu-sheng <liush...@huawei.com> +malei <malei@maleideMacBook-Pro.local> melissaml <ma....@99cloud.net> mengalong <alongm...@gmail.com> zhangguoqing <zhang.guoq...@99cloud.net> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/ChangeLog new/tooz-1.64.2/ChangeLog --- old/tooz-1.62.1/ChangeLog 2019-03-18 00:11:02.000000000 +0100 +++ new/tooz-1.64.2/ChangeLog 2019-02-26 01:18:41.000000000 +0100 @@ -1,13 +1,41 @@ CHANGES ======= -1.62.1 +1.64.2 +------ + + +1.64.1 ------ * Fixed UnicodeEncodeError for Python2 unicode objects + +1.64.0 +------ + +* More explicitly document driver connection strings +* Unblock tooz gate +* Change openstack-dev to openstack-discuss + +1.63.1 +------ + + +1.63.0 +------ + +* coordination: do not retry the whole heartbeat on fail +* Use templates for cover +* Migrate to stestr +* Fix coverage tests +* Switch to autodoc\_default\_options +* Ensure consistent encoding of strings for ID +* add lib-forward-testing-python3 test job +* add python 3.6 unit test job * import zuul job settings from project-config +* Update reno for stable/rocky +* Add release note link in README * fix tox python3 overrides -* Update .gitreview for stable/rocky 1.62.0 ------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/PKG-INFO new/tooz-1.64.2/PKG-INFO --- old/tooz-1.62.1/PKG-INFO 2019-03-18 00:11:02.000000000 +0100 +++ new/tooz-1.64.2/PKG-INFO 2019-02-26 01:18:41.000000000 +0100 @@ -1,10 +1,10 @@ Metadata-Version: 2.1 Name: tooz -Version: 1.62.1 +Version: 1.64.2 Summary: Coordination library for distributed systems. Home-page: https://docs.openstack.org/tooz/latest/ Author: OpenStack -Author-email: openstack-...@lists.openstack.org +Author-email: openstack-disc...@lists.openstack.org License: Apache-2 Description: Tooz ==== @@ -25,6 +25,7 @@ * Documentation: https://docs.openstack.org/tooz/latest/ * Source: https://git.openstack.org/cgit/openstack/tooz * Bugs: https://bugs.launchpad.net/python-tooz/ + * Release notes: https://docs.openstack.org/releasenotes/tooz Join us ------- @@ -44,16 +45,16 @@ Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.5 Classifier: Topic :: System :: Distributed Computing -Provides-Extra: zake Provides-Extra: zookeeper -Provides-Extra: ipc -Provides-Extra: test -Provides-Extra: mysql Provides-Extra: postgresql Provides-Extra: consul -Provides-Extra: etcd3gw -Provides-Extra: etcd3 Provides-Extra: doc -Provides-Extra: memcached -Provides-Extra: redis +Provides-Extra: zake +Provides-Extra: etcd3 Provides-Extra: etcd +Provides-Extra: etcd3gw +Provides-Extra: redis +Provides-Extra: test +Provides-Extra: memcached +Provides-Extra: ipc +Provides-Extra: mysql diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/README.rst new/tooz-1.64.2/README.rst --- old/tooz-1.62.1/README.rst 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/README.rst 2019-02-26 01:17:24.000000000 +0100 @@ -17,6 +17,7 @@ * Documentation: https://docs.openstack.org/tooz/latest/ * Source: https://git.openstack.org/cgit/openstack/tooz * Bugs: https://bugs.launchpad.net/python-tooz/ +* Release notes: https://docs.openstack.org/releasenotes/tooz Join us ------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/doc/requirements.txt new/tooz-1.64.2/doc/requirements.txt --- old/tooz-1.62.1/doc/requirements.txt 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/doc/requirements.txt 2019-02-26 01:17:24.000000000 +0100 @@ -10,3 +10,5 @@ psycopg2>=2.5 # LGPL/ZPL PyMySQL>=0.6.2 # MIT License pymemcache!=1.3.0,>=1.2.9 # Apache 2.0 License +etcd3>=0.6.2 # Apache-2.0 +etcd3gw>=0.1.0 # Apache-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/doc/source/conf.py new/tooz-1.64.2/doc/source/conf.py --- old/tooz-1.62.1/doc/source/conf.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/doc/source/conf.py 2019-02-26 01:17:24.000000000 +0100 @@ -260,4 +260,8 @@ # extlinks = { # } -autodoc_default_flags = ['members', 'special-members', 'show-inheritance'] +autodoc_default_options = { + 'members': None, + 'special-members': None, + 'show_inheritance': None, + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/doc/source/reference/index.rst new/tooz-1.64.2/doc/source/reference/index.rst --- old/tooz-1.62.1/doc/source/reference/index.rst 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/doc/source/reference/index.rst 2019-02-26 01:17:24.000000000 +0100 @@ -20,6 +20,18 @@ .. autoclass:: tooz.drivers.etcd.EtcdDriver :members: +Etcd3 +~~~~~ + +.. autoclass:: tooz.drivers.etcd3.Etcd3Driver + :members: + +Etcd3gw +~~~~~~~ + +.. autoclass:: tooz.drivers.etcd3gw.Etcd3Driver + :members: + File ~~~~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/doc/source/user/drivers.rst new/tooz-1.64.2/doc/source/user/drivers.rst --- old/tooz-1.62.1/doc/source/user/drivers.rst 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/doc/source/user/drivers.rst 2019-02-26 01:17:24.000000000 +0100 @@ -198,6 +198,38 @@ and is based on the `etcd server`_ supported key/value storage and associated primitives. +Etcd3 +----- + +**Driver:** :py:class:`tooz.drivers.etcd3.Etcd3Driver` + +**Characteristics:** :py:attr:`tooz.drivers.etcd3.Etcd3Driver.CHARACTERISTICS` + +**Entrypoint name:** ``etcd3`` + +**Summary:** + +The etcd3 driver is a driver providing only distributed locks (for now) +and is based on the `etcd server`_ supported key/value storage and +associated primitives. + +Etcd3 Gateway +------------- + +**Driver:** :py:class:`tooz.drivers.etcd3gw.Etcd3Driver` + +**Characteristics:** +:py:attr:`tooz.drivers.etcd3gw.Etcd3Driver.CHARACTERISTICS` + +**Entrypoint name:** ``etcd3+http`` + +**Summary:** + +The etcd3gw driver is a driver providing only distributed locks (for now) +and is based on the `etcd server`_ supported key/value storage and +associated primitives. It relies on the `GRPC Gateway`_ to provide HTTP access +to etcd3. + Consul ------ @@ -231,3 +263,4 @@ .. _PostgreSQL database server: http://postgresql.org .. _MySQL database server: http://mysql.org .. _redis-sentinel: http://redis.io/topics/sentinel +.. _GRPC Gateway: https://github.com/grpc-ecosystem/grpc-gateway diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/releasenotes/source/index.rst new/tooz-1.64.2/releasenotes/source/index.rst --- old/tooz-1.62.1/releasenotes/source/index.rst 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/releasenotes/source/index.rst 2019-02-26 01:17:24.000000000 +0100 @@ -6,6 +6,7 @@ :maxdepth: 1 unreleased + rocky queens pike ocata diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/releasenotes/source/rocky.rst new/tooz-1.64.2/releasenotes/source/rocky.rst --- old/tooz-1.62.1/releasenotes/source/rocky.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/tooz-1.64.2/releasenotes/source/rocky.rst 2019-02-26 01:17:24.000000000 +0100 @@ -0,0 +1,6 @@ +=================================== + Rocky Series Release Notes +=================================== + +.. release-notes:: + :branch: stable/rocky diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/requirements.txt new/tooz-1.64.2/requirements.txt --- old/tooz-1.62.1/requirements.txt 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/requirements.txt 2019-02-26 01:17:24.000000000 +0100 @@ -4,12 +4,13 @@ pbr>=1.6 # Apache-2.0 stevedore>=1.16.0 # Apache-2.0 six>=1.9.0 # MIT -enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD +enum34>=1.0.4;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD voluptuous>=0.8.9 # BSD License msgpack>=0.4.0 # Apache-2.0 fasteners>=0.7 # Apache-2.0 tenacity>=3.2.1 # Apache-2.0 futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD -futurist!=0.15.0,>=0.11.0 # Apache-2.0 +futurist>=1.2.0 # Apache-2.0 oslo.utils>=3.15.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 +grpcio>=1.0.0,<1.16.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/setup.cfg new/tooz-1.64.2/setup.cfg --- old/tooz-1.62.1/setup.cfg 2019-03-18 00:11:02.000000000 +0100 +++ new/tooz-1.64.2/setup.cfg 2019-02-26 01:18:41.000000000 +0100 @@ -1,7 +1,7 @@ [metadata] name = tooz author = OpenStack -author-email = openstack-...@lists.openstack.org +author-email = openstack-disc...@lists.openstack.org summary = Coordination library for distributed systems. description-file = README.rst license = Apache-2 @@ -65,12 +65,12 @@ test = mock>=2.0 # BSD python-subunit>=0.0.18 # Apache-2.0/BSD - testrepository>=0.0.18 # Apache-2.0/BSD testtools>=1.4.0 # MIT coverage>=3.6 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD pifpaf>=0.10.0 # Apache-2.0 os-testr>=0.8.0 # Apache-2.0 + stestr>=2.0.0 doc = sphinx>=1.6.2 # BSD openstackdocstheme>=1.11.0 # Apache-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tools/pretty_tox.sh new/tooz-1.64.2/tools/pretty_tox.sh --- old/tooz-1.62.1/tools/pretty_tox.sh 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tools/pretty_tox.sh 2019-02-26 01:17:24.000000000 +0100 @@ -10,7 +10,7 @@ # # this work around exists until that is addressed if [[ "$TESTARGS" =~ "until-failure" ]]; then - python setup.py testr --slowest --testr-args="$TESTRARGS" + stestr run --slowest "$TESTRARGS" else - python setup.py testr --slowest --testr-args="--subunit $TESTRARGS" | subunit-trace -f + stestr run --slowest --subunit "$TESTRARGS" | subunit-trace -f fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/coordination.py new/tooz-1.64.2/tooz/coordination.py --- old/tooz-1.62.1/tooz/coordination.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/coordination.py 2019-02-26 01:17:24.000000000 +0100 @@ -23,11 +23,11 @@ import threading from oslo_utils import encodeutils -from oslo_utils import excutils from oslo_utils import netutils from oslo_utils import timeutils import six from stevedore import driver +import tenacity import tooz from tooz import _retry @@ -179,12 +179,15 @@ return not (self._runner is None or not self._runner.is_alive()) - @excutils.forever_retry_uncaught_exceptions def _beat_forever_until_stopped(self): """Inner beating loop.""" + retry = tenacity.Retrying( + wait=tenacity.wait_fixed(1), + before_sleep=tenacity.before_sleep_log(LOG, logging.warning), + ) while not self._dead.is_set(): with timeutils.StopWatch() as w: - wait_until_next_beat = self._driver.heartbeat() + wait_until_next_beat = retry(self._driver.heartbeat) ran_for = w.elapsed() has_to_sleep_for = wait_until_next_beat - ran_for if has_to_sleep_for < 0: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/consul.py new/tooz-1.64.2/tooz/drivers/consul.py --- old/tooz-1.62.1/tooz/drivers/consul.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/consul.py 2019-02-26 01:17:24.000000000 +0100 @@ -91,10 +91,22 @@ needed to make Consul being used as an option for Distributed Locking. The data is stored in Consul's key-value store. - To configure the client to your liking please refer - http://python-consul.readthedocs.org/en/latest/. Few options like 'ttl' - and 'namespace' will be passed as part of the options. 'ttl' governs the - duration till when the session holding the lock will be active. + The Consul driver connection URI should look like:: + + consul://HOST[:PORT][?OPTION1=VALUE1[&OPTION2=VALUE2[&...]]] + + If not specified, PORT defaults to 8500. + Available options are: + + ================== ======= + Name Default + ================== ======= + ttl 15 + namespace tooz + ================== ======= + + For details on the available options, refer to + http://python-consul.readthedocs.org/en/latest/. .. _python-consul: http://python-consul.readthedocs.org/ .. _consul: https://consul.io/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/etcd.py new/tooz-1.64.2/tooz/drivers/etcd.py --- old/tooz-1.62.1/tooz/drivers/etcd.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/etcd.py 2019-02-26 01:17:24.000000000 +0100 @@ -203,6 +203,21 @@ This driver uses etcd provide the coordination driver semantics and required API(s). + + The Etcd driver connection URI should look like:: + + etcd://[HOST[:PORT]][?OPTION1=VALUE1[&OPTION2=VALUE2[&...]]] + + If not specified, HOST defaults to localhost and PORT defaults to 2379. + Available options are: + + ================== ======= + Name Default + ================== ======= + protocol http + timeout 30 + lock_timeout 30 + ================== ======= """ #: Default socket/lock/member/leader timeout used when none is provided. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/etcd3.py new/tooz-1.64.2/tooz/drivers/etcd3.py --- old/tooz-1.62.1/tooz/drivers/etcd3.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/etcd3.py 2019-02-26 01:17:24.000000000 +0100 @@ -115,6 +115,22 @@ This driver uses etcd provide the coordination driver semantics and required API(s). + + The Etcd driver connection URI should look like:: + + etcd3://[HOST[:PORT]][?OPTION1=VALUE1[&OPTION2=VALUE2[&...]]] + + If not specified, HOST defaults to localhost and PORT defaults to 2379. + Available options are: + + ================== ======= + Name Default + ================== ======= + protocol http + timeout 30 + lock_timeout 30 + membership_timeout 30 + ================== ======= """ #: Default socket/lock/member/leader timeout used when none is provided. @@ -160,10 +176,10 @@ GROUP_PREFIX = b"tooz/groups/" def _encode_group_id(self, group_id): - return self.GROUP_PREFIX + group_id + b"/" + return self.GROUP_PREFIX + utils.to_binary(group_id) + b"/" def _encode_group_member_id(self, group_id, member_id): - return self._encode_group_id(group_id) + member_id + return self._encode_group_id(group_id) + utils.to_binary(member_id) def create_group(self, group_id): encoded_group = self._encode_group_id(group_id) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/etcd3gw.py new/tooz-1.64.2/tooz/drivers/etcd3gw.py --- old/tooz-1.62.1/tooz/drivers/etcd3gw.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/etcd3gw.py 2019-02-26 01:17:24.000000000 +0100 @@ -166,6 +166,22 @@ This driver uses etcd provide the coordination driver semantics and required API(s). + + The Etcd driver connection URI should look like:: + + etcd3+http://[HOST[:PORT]][?OPTION1=VALUE1[&OPTION2=VALUE2[&...]]] + + If not specified, HOST defaults to localhost and PORT defaults to 2379. + Available options are: + + ================== ======= + Name Default + ================== ======= + protocol http + timeout 30 + lock_timeout 30 + membership_timeout 30 + ================== ======= """ #: Default socket/lock/member/leader timeout used when none is provided. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/file.py new/tooz-1.64.2/tooz/drivers/file.py --- old/tooz-1.62.1/tooz/drivers/file.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/file.py 2019-02-26 01:17:24.000000000 +0100 @@ -186,6 +186,13 @@ missing some functionality but in the future these not implemented API(s) will be filled in. + The File driver connection URI should look like:: + + file://DIRECTORY[?timeout=TIMEOUT] + + DIRECTORY is the location that should be used to store lock files. + TIMEOUT defaults to 10. + General recommendations/usage considerations: - It does **not** automatically delete members from diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/ipc.py new/tooz-1.64.2/tooz/drivers/ipc.py --- old/tooz-1.62.1/tooz/drivers/ipc.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/ipc.py 2019-02-26 01:17:24.000000000 +0100 @@ -141,6 +141,10 @@ semantics and required API(s). It **is** missing some functionality but in the future these not implemented API(s) will be filled in. + The IPC driver connection URI should look like:: + + ipc:// + General recommendations/usage considerations: - It is **not** distributed (or recommended to be used in those diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/memcached.py new/tooz-1.64.2/tooz/drivers/memcached.py --- old/tooz-1.62.1/tooz/drivers/memcached.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/memcached.py 2019-02-26 01:17:24.000000000 +0100 @@ -190,6 +190,23 @@ all of the coordination driver API(s). It stores data into memcache using expiries and `msgpack`_ encoded values. + The Memcached driver connection URI should look like:: + + memcached://[HOST[:PORT]][?OPTION1=VALUE1[&OPTION2=VALUE2[&...]]] + + If not specified, HOST defaults to localhost and PORT defaults to 11211. + Available options are: + + ================== ======= + Name Default + ================== ======= + timeout 30 + membership_timeout 30 + lock_timeout 30 + leader_timeout 30 + max_pool_size None + ================== ======= + General recommendations/usage considerations: - Memcache (without different backend technology) is a **cache** enough @@ -285,13 +302,13 @@ self.client.close() def _encode_group_id(self, group_id): - return self.GROUP_PREFIX + group_id + return self.GROUP_PREFIX + utils.to_binary(group_id) def _encode_member_id(self, member_id): - return self.MEMBER_PREFIX + member_id + return self.MEMBER_PREFIX + utils.to_binary(member_id) def _encode_group_leader(self, group_id): - return self.GROUP_LEADER_PREFIX + group_id + return self.GROUP_LEADER_PREFIX + utils.to_binary(group_id) @_retry.retry() def _add_group_to_group_list(self, group_id): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/mysql.py new/tooz-1.64.2/tooz/drivers/mysql.py --- old/tooz-1.62.1/tooz/drivers/mysql.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/mysql.py 2019-02-26 01:17:24.000000000 +0100 @@ -114,6 +114,12 @@ missing some functionality but in the future these not implemented API(s) will be filled in. + The MySQL driver connection URI should look like:: + + mysql://USERNAME:PASSWORD@HOST[:PORT]/DBNAME[?unix_socket=SOCKET_PATH] + + If not specified, PORT defaults to 3306. + .. _MySQL: http://dev.mysql.com/ """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/pgsql.py new/tooz-1.64.2/tooz/drivers/pgsql.py --- old/tooz-1.62.1/tooz/drivers/pgsql.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/pgsql.py 2019-02-26 01:17:24.000000000 +0100 @@ -174,6 +174,10 @@ missing some functionality but in the future these not implemented API(s) will be filled in. + The PostgreSQL driver connection URI should look like:: + + postgresql://[USERNAME[:PASSWORD]@]HOST:PORT?dbname=DBNAME + .. _PostgreSQL: http://www.postgresql.org/ """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/redis.py new/tooz-1.64.2/tooz/drivers/redis.py --- old/tooz-1.62.1/tooz/drivers/redis.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/redis.py 2019-02-26 01:17:24.000000000 +0100 @@ -138,6 +138,14 @@ some notion of HA (values *can* be lost when a failover transition occurs). + The Redis driver connection URI should look like:: + + redis://[:PASSWORD@]HOST:PORT[?OPTION=VALUE[&OPTION2=VALUE2[&...]]] + + For a list of options recognized by this driver, see the documentation + for the member CLIENT_ARGS, and to determine the expected types of those + options see CLIENT_BOOL_ARGS, CLIENT_INT_ARGS, and CLIENT_LIST_ARGS. + To use a `sentinel`_ the connection URI must point to the sentinel server. At connection time the sentinel will be asked for the current IP and port of the master and then connect there. The connection URI for sentinel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz/drivers/zookeeper.py new/tooz-1.64.2/tooz/drivers/zookeeper.py --- old/tooz-1.62.1/tooz/drivers/zookeeper.py 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tooz/drivers/zookeeper.py 2019-02-26 01:17:24.000000000 +0100 @@ -88,6 +88,10 @@ will be extracted from the coordinator url (or any provided options), so that a specific coordinator can be created that will work for you. + The Zookeeper coordinator url should look like:: + + zookeeper://[USERNAME:PASSWORD@][HOST[:PORT]][?OPTION1=VALUE1[&OPTION2=VALUE2[&...]]] + Currently the following options will be proxied to the contained client: ================ =============================== ==================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz.egg-info/PKG-INFO new/tooz-1.64.2/tooz.egg-info/PKG-INFO --- old/tooz-1.62.1/tooz.egg-info/PKG-INFO 2019-03-18 00:11:02.000000000 +0100 +++ new/tooz-1.64.2/tooz.egg-info/PKG-INFO 2019-02-26 01:18:41.000000000 +0100 @@ -1,10 +1,10 @@ Metadata-Version: 2.1 Name: tooz -Version: 1.62.1 +Version: 1.64.2 Summary: Coordination library for distributed systems. Home-page: https://docs.openstack.org/tooz/latest/ Author: OpenStack -Author-email: openstack-...@lists.openstack.org +Author-email: openstack-disc...@lists.openstack.org License: Apache-2 Description: Tooz ==== @@ -25,6 +25,7 @@ * Documentation: https://docs.openstack.org/tooz/latest/ * Source: https://git.openstack.org/cgit/openstack/tooz * Bugs: https://bugs.launchpad.net/python-tooz/ + * Release notes: https://docs.openstack.org/releasenotes/tooz Join us ------- @@ -44,16 +45,16 @@ Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.5 Classifier: Topic :: System :: Distributed Computing -Provides-Extra: zake Provides-Extra: zookeeper -Provides-Extra: ipc -Provides-Extra: test -Provides-Extra: mysql Provides-Extra: postgresql Provides-Extra: consul -Provides-Extra: etcd3gw -Provides-Extra: etcd3 Provides-Extra: doc -Provides-Extra: memcached -Provides-Extra: redis +Provides-Extra: zake +Provides-Extra: etcd3 Provides-Extra: etcd +Provides-Extra: etcd3gw +Provides-Extra: redis +Provides-Extra: test +Provides-Extra: memcached +Provides-Extra: ipc +Provides-Extra: mysql diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz.egg-info/SOURCES.txt new/tooz-1.64.2/tooz.egg-info/SOURCES.txt --- old/tooz-1.62.1/tooz.egg-info/SOURCES.txt 2019-03-18 00:11:02.000000000 +0100 +++ new/tooz-1.64.2/tooz.egg-info/SOURCES.txt 2019-02-26 01:18:41.000000000 +0100 @@ -1,5 +1,5 @@ .coveragerc -.testr.conf +.stestr.conf .zuul.yaml AUTHORS CONTRIBUTING.rst @@ -50,6 +50,7 @@ releasenotes/source/ocata.rst releasenotes/source/pike.rst releasenotes/source/queens.rst +releasenotes/source/rocky.rst releasenotes/source/unreleased.rst releasenotes/source/_static/.placeholder releasenotes/source/_templates/.placeholder diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz.egg-info/pbr.json new/tooz-1.64.2/tooz.egg-info/pbr.json --- old/tooz-1.62.1/tooz.egg-info/pbr.json 2019-03-18 00:11:02.000000000 +0100 +++ new/tooz-1.64.2/tooz.egg-info/pbr.json 2019-02-26 01:18:41.000000000 +0100 @@ -1 +1 @@ -{"git_version": "747f022", "is_release": true} \ No newline at end of file +{"git_version": "d554492", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tooz.egg-info/requires.txt new/tooz-1.64.2/tooz.egg-info/requires.txt --- old/tooz-1.62.1/tooz.egg-info/requires.txt 2019-03-18 00:11:02.000000000 +0100 +++ new/tooz-1.64.2/tooz.egg-info/requires.txt 2019-02-26 01:18:41.000000000 +0100 @@ -5,12 +5,13 @@ msgpack>=0.4.0 fasteners>=0.7 tenacity>=3.2.1 -futurist!=0.15.0,>=0.11.0 +futurist>=1.2.0 oslo.utils>=3.15.0 oslo.serialization>=1.10.0 +grpcio<1.16.0,>=1.0.0 [:(python_version=='2.7' or python_version=='2.6' or python_version=='3.3')] -enum34 +enum34>=1.0.4 [:(python_version=='2.7' or python_version=='2.6')] futures>=3.0 @@ -50,12 +51,12 @@ [test] mock>=2.0 python-subunit>=0.0.18 -testrepository>=0.0.18 testtools>=1.4.0 coverage>=3.6 fixtures>=3.0.0 pifpaf>=0.10.0 os-testr>=0.8.0 +stestr>=2.0.0 [zake] zake>=0.1.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tooz-1.62.1/tox.ini new/tooz-1.64.2/tox.ini --- old/tooz-1.62.1/tox.ini 2019-03-18 00:09:34.000000000 +0100 +++ new/tooz-1.64.2/tox.ini 2019-02-26 01:17:24.000000000 +0100 @@ -46,7 +46,42 @@ [testenv:cover] basepython = python3 -commands = python setup.py testr --slowest --coverage --testr-args="{posargs}" +# NOTE(bnemec): Unfortunately, referencing testenv deps doesn't work here, so +# we have to duplicate the entire list. +# See https://github.com/tox-dev/tox/issues/706 +deps = .[test,zake,ipc,memcached,mysql,etcd,etcd3,etcd3gw] + zookeeper: .[zookeeper] + redis: .[redis] + sentinel: .[redis] + memcached: .[memcached] + postgresql: .[postgresql] + mysql: .[mysql] + etcd: .[etcd] + etcd3: .[etcd3] + etcd3gw: .[etcd3gw] + consul: .[consul] + coverage +setenv = + PYTHON=coverage run --source tooz --parallel-mode + TOOZ_TEST_URLS = file:///tmp zake:// ipc:// + zookeeper: TOOZ_TEST_DRIVERS = zookeeper + redis: TOOZ_TEST_DRIVERS = redis + sentinel: TOOZ_TEST_DRIVERS = redis --sentinel + memcached: TOOZ_TEST_DRIVERS = memcached + mysql: TOOZ_TEST_DRIVERS = mysql + postgresql: TOOZ_TEST_DRIVERS = postgresql + etcd: TOOZ_TEST_DRIVERS = etcd,etcd --cluster + etcd3: TOOZ_TEST_DRIVERS = etcd + etcd3: TOOZ_TEST_ETCD3 = 1 + etcd3gw: TOOZ_TEST_DRIVERS = etcd + etcd3gw: TOOZ_TEST_ETCD3GW = 1 + consul: TOOZ_TEST_DRIVERS = consul +commands = + {toxinidir}/run-tests.sh {toxinidir}/tools/pretty_tox.sh "{posargs}" + {toxinidir}/run-examples.sh + coverage combine + coverage html -d cover + coverage xml -o cover/coverage.xml [testenv:docs] basepython = python3