Hello community,
here is the log from the commit of package python-zaqarclient for
openSUSE:Factory checked in at 2018-01-24 15:28:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-zaqarclient (Old)
and /work/SRC/openSUSE:Factory/.python-zaqarclient.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-zaqarclient"
Wed Jan 24 15:28:10 2018 rev:6 rq:567285 version:1.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-zaqarclient/python-zaqarclient.changes
2017-08-28 15:32:08.778387514 +0200
+++
/work/SRC/openSUSE:Factory/.python-zaqarclient.new/python-zaqarclient.changes
2018-01-24 15:28:12.948784436 +0100
@@ -1,0 +2,15 @@
+Mon Jan 15 12:06:41 UTC 2018 - cloud-de...@suse.de
+
+- update to version 1.8.0
+ - Remove -U from pip install
+ - Update reno for stable/pike
+ - Remove setting of version/release from releasenotes
+ - Fix functional CI failure
+ - Fix renew claim NoneType error
+ - Avoid tox_install.sh for constraints support
+ - Fix class Queue __init__ method's param note
+ - Updated from global requirements
+ - Add claim_count to message __init__()
+ - Update queue metadata failed when the original value is zero.
+
+-------------------------------------------------------------------
Old:
----
python-zaqarclient-1.7.0.tar.gz
New:
----
python-zaqarclient-1.8.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-zaqarclient.spec ++++++
--- /var/tmp/diff_new_pack.xgF9Ag/_old 2018-01-24 15:28:13.496758806 +0100
+++ /var/tmp/diff_new_pack.xgF9Ag/_new 2018-01-24 15:28:13.500758619 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-zaqarclient
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,43 +18,43 @@
%global sname zaqarclient
Name: python-zaqarclient
-Version: 1.7.0
+Version: 1.8.0
Release: 0
Summary: Client Library for OpenStack Zaqar Queueing API
License: Apache-2.0
Group: Development/Languages/Python
Url: http://launchpad.net/%{sname}
-Source0:
https://pypi.io/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+Source0:
https://files.pythonhosted.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: python-ddt >= 1.0.1
BuildRequires: python-devel
BuildRequires: python-fixtures >= 3.0.0
-BuildRequires: python-jsonschema >= 2.0.0
-BuildRequires: python-keystoneauth1 >= 2.21.0
-BuildRequires: python-mock >= 2.0
-BuildRequires: python-nose
-BuildRequires: python-nose-exclude
-BuildRequires: python-os-client-config >= 1.27.0
-BuildRequires: python-osc-lib >= 1.5.1
-BuildRequires: python-oslo.i18n >= 2.1.0
-BuildRequires: python-oslo.log >= 3.22.0
+BuildRequires: python-jsonschema >= 2.6.0
+BuildRequires: python-keystoneauth1 >= 3.2.0
+BuildRequires: python-mock >= 2.0.0
+BuildRequires: python-nose >= 1.3.7
+BuildRequires: python-nose-exclude >= 0.3.0
+BuildRequires: python-os-client-config >= 1.28.0
+BuildRequires: python-osc-lib >= 1.7.0
+BuildRequires: python-oslo.i18n >= 3.15.3
+BuildRequires: python-oslo.log >= 3.30.0
BuildRequires: python-pbr >= 2.0.0
-BuildRequires: python-python-subunit >= 0.0.18
+BuildRequires: python-python-subunit >= 1.0.0
BuildRequires: python-requests >= 2.14.2
-BuildRequires: python-requests-mock >= 1.1
+BuildRequires: python-requests-mock >= 1.1.0
BuildRequires: python-setuptools >= 16.0
BuildRequires: python-testrepository >= 0.0.18
BuildRequires: python-testscenarios >= 0.4
-BuildRequires: python-testtools >= 1.4.0
-Requires: python-jsonschema >= 2.0.0
-Requires: python-keystoneauth1 >= 2.21.0
-Requires: python-osc-lib >= 1.5.1
-Requires: python-oslo.i18n >= 2.1.0
-Requires: python-oslo.log >= 3.22.0
-Requires: python-oslo.utils >= 3.20.0
+BuildRequires: python-testtools >= 2.2.0
+Requires: python-jsonschema >= 2.6.0
+Requires: python-keystoneauth1 >= 3.2.0
+Requires: python-osc-lib >= 1.7.0
+Requires: python-oslo.i18n >= 3.15.3
+Requires: python-oslo.log >= 3.30.0
+Requires: python-oslo.utils >= 3.31.0
Requires: python-pbr >= 2.0.0
Requires: python-requests >= 2.14.2
-Requires: python-six >= 1.9.0
+Requires: python-six >= 1.10.0
Requires: python-stevedore >= 1.20.0
BuildArch: noarch
@@ -63,9 +63,9 @@
%package doc
Summary: Documentation for OpenStack Zaqar Queueing API
-Group: Documentation
+Group: Documentation/HTML
BuildRequires: python-Sphinx
-BuildRequires: python-openstackdocstheme >= 1.11.0
+BuildRequires: python-openstackdocstheme >= 1.17.0
%description doc
Documentation for the client library for interacting with Openstack
++++++ _service ++++++
--- /var/tmp/diff_new_pack.xgF9Ag/_old 2018-01-24 15:28:13.528757309 +0100
+++ /var/tmp/diff_new_pack.xgF9Ag/_new 2018-01-24 15:28:13.532757122 +0100
@@ -1,8 +1,8 @@
<services>
<service mode="disabled" name="renderspec">
- <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/openstack/python-zaqarclient/python-zaqarclient.spec.j2</param>
+ <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/master/openstack/python-zaqarclient/python-zaqarclient.spec.j2</param>
<param name="output-name">python-zaqarclient.spec</param>
- <param
name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/pike/global-requirements.txt</param>
+ <param
name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/master/requirements.txt</param>
<param name="changelog-email">cloud-de...@suse.de</param>
<param name="changelog-provider">gh,openstack,python-zaqarclient</param>
</service>
++++++ python-zaqarclient-1.7.0.tar.gz -> python-zaqarclient-1.8.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-zaqarclient-1.7.0/AUTHORS
new/python-zaqarclient-1.8.0/AUTHORS
--- old/python-zaqarclient-1.7.0/AUTHORS 2017-07-28 09:40:18.000000000
+0200
+++ new/python-zaqarclient-1.8.0/AUTHORS 2017-12-18 13:55:39.000000000
+0100
@@ -63,17 +63,20 @@
Yuuichi Fujioka <fujioka-yuui...@zx.mxh.nes.nec.co.jp>
ZhaoBo <zhao...@huawei.com>
Zhi Yan Liu <zhiy...@cn.ibm.com>
+Zuul <z...@review.openstack.org>
avnish <avnish....@nectechnologies.in>
daohanli <dhli5...@fiberhome.com>
digambar <digambarpati...@yahoo.co.in>
dynarro <doralynava...@gmail.com>
gecong1973 <ge.c...@zte.com.cn>
+gengchc2 <geng.changc...@zte.com.cn>
howardlee <lihongwe...@inspur.com>
jonnary <liu.xuefe...@zte.com.cn>
kgriffs <kurt.griffi...@rackspace.com>
lingyongxu <l...@fiberhome.com>
liusheng <liush...@huawei.com>
miaohb <miao.hong...@zte.com.cn>
+rabi <ramis...@redhat.com>
rajat29 <rajat.sha...@nectechnologies.in>
ricolin <ric...@inwinstack.com>
ricolin <rico....@easystack.cn>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-zaqarclient-1.7.0/ChangeLog
new/python-zaqarclient-1.8.0/ChangeLog
--- old/python-zaqarclient-1.7.0/ChangeLog 2017-07-28 09:40:18.000000000
+0200
+++ new/python-zaqarclient-1.8.0/ChangeLog 2017-12-18 13:55:39.000000000
+0100
@@ -1,9 +1,26 @@
CHANGES
=======
+1.8.0
+-----
+
+* Add claim\_count to message \_\_init\_\_()
+* Remove -U from pip install
+* Avoid tox\_install.sh for constraints support
+* Remove setting of version/release from releasenotes
+* Updated from global requirements
+* Updated from global requirements
+* Update queue metadata failed when the original value is zero
+* Updated from global requirements
+* Fix functional CI failure
+* Updated from global requirements
+* Fix renew claim NoneType error
+* Update reno for stable/pike
+
1.7.0
-----
+* Fix class Queue \_\_init\_\_ method's param note
* Updated from global requirements
* Switch from oslosphinx to openstackdocstheme
* Update the documentation link for doc migration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-zaqarclient-1.7.0/PKG-INFO
new/python-zaqarclient-1.8.0/PKG-INFO
--- old/python-zaqarclient-1.7.0/PKG-INFO 2017-07-28 09:40:19.000000000
+0200
+++ new/python-zaqarclient-1.8.0/PKG-INFO 2017-12-18 13:55:40.000000000
+0100
@@ -1,11 +1,12 @@
Metadata-Version: 1.1
Name: python-zaqarclient
-Version: 1.7.0
+Version: 1.8.0
Summary: Client Library for OpenStack Zaqar Messaging API
Home-page: https://docs.openstack.org/zaqar/latest/
Author: OpenStack
Author-email: openstack-...@lists.openstack.org
License: UNKNOWN
+Description-Content-Type: UNKNOWN
Description: ========================
Team and repository tags
========================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-zaqarclient-1.7.0/python_zaqarclient.egg-info/PKG-INFO
new/python-zaqarclient-1.8.0/python_zaqarclient.egg-info/PKG-INFO
--- old/python-zaqarclient-1.7.0/python_zaqarclient.egg-info/PKG-INFO
2017-07-28 09:40:18.000000000 +0200
+++ new/python-zaqarclient-1.8.0/python_zaqarclient.egg-info/PKG-INFO
2017-12-18 13:55:39.000000000 +0100
@@ -1,11 +1,12 @@
Metadata-Version: 1.1
Name: python-zaqarclient
-Version: 1.7.0
+Version: 1.8.0
Summary: Client Library for OpenStack Zaqar Messaging API
Home-page: https://docs.openstack.org/zaqar/latest/
Author: OpenStack
Author-email: openstack-...@lists.openstack.org
License: UNKNOWN
+Description-Content-Type: UNKNOWN
Description: ========================
Team and repository tags
========================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-zaqarclient-1.7.0/python_zaqarclient.egg-info/SOURCES.txt
new/python-zaqarclient-1.8.0/python_zaqarclient.egg-info/SOURCES.txt
--- old/python-zaqarclient-1.7.0/python_zaqarclient.egg-info/SOURCES.txt
2017-07-28 09:40:19.000000000 +0200
+++ new/python-zaqarclient-1.8.0/python_zaqarclient.egg-info/SOURCES.txt
2017-12-18 13:55:39.000000000 +0100
@@ -47,6 +47,7 @@
releasenotes/source/conf.py
releasenotes/source/index.rst
releasenotes/source/ocata.rst
+releasenotes/source/pike.rst
releasenotes/source/unreleased.rst
tests/__init__.py
tests/functional/__init__.py
@@ -102,7 +103,6 @@
tests/unit/transport/test_http.py
tests/unit/transport/test_request.py
tests/unit/transport/test_ws.py
-tools/tox_install.sh
zaqarclient/__init__.py
zaqarclient/_i18n.py
zaqarclient/errors.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-zaqarclient-1.7.0/python_zaqarclient.egg-info/pbr.json
new/python-zaqarclient-1.8.0/python_zaqarclient.egg-info/pbr.json
--- old/python-zaqarclient-1.7.0/python_zaqarclient.egg-info/pbr.json
2017-07-28 09:40:18.000000000 +0200
+++ new/python-zaqarclient-1.8.0/python_zaqarclient.egg-info/pbr.json
2017-12-18 13:55:39.000000000 +0100
@@ -1 +1 @@
-{"git_version": "b6d59fc", "is_release": true}
\ No newline at end of file
+{"git_version": "a2bc819", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-zaqarclient-1.7.0/python_zaqarclient.egg-info/requires.txt
new/python-zaqarclient-1.8.0/python_zaqarclient.egg-info/requires.txt
--- old/python-zaqarclient-1.7.0/python_zaqarclient.egg-info/requires.txt
2017-07-28 09:40:18.000000000 +0200
+++ new/python-zaqarclient-1.8.0/python_zaqarclient.egg-info/requires.txt
2017-12-18 13:55:39.000000000 +0100
@@ -1,10 +1,10 @@
pbr!=2.1.0,>=2.0.0
requests>=2.14.2
-six>=1.9.0
+six>=1.10.0
stevedore>=1.20.0
-jsonschema!=2.5.0,<3.0.0,>=2.0.0
-oslo.i18n!=3.15.2,>=2.1.0
-oslo.log>=3.22.0
-oslo.utils>=3.20.0
-keystoneauth1>=3.0.1
+jsonschema<3.0.0,>=2.6.0
+oslo.i18n>=3.15.3
+oslo.log>=3.30.0
+oslo.utils>=3.31.0
+keystoneauth1>=3.2.0
osc-lib>=1.7.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-zaqarclient-1.7.0/releasenotes/source/conf.py
new/python-zaqarclient-1.8.0/releasenotes/source/conf.py
--- old/python-zaqarclient-1.7.0/releasenotes/source/conf.py 2017-07-28
09:38:46.000000000 +0200
+++ new/python-zaqarclient-1.8.0/releasenotes/source/conf.py 2017-12-18
13:53:16.000000000 +0100
@@ -23,8 +23,6 @@
# All configuration values have a default; values that are commented out
# serve to show the default.
-from zaqarclient.version import version_info as zaqarclient_version
-
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -59,14 +57,11 @@
project = u'ZaqarClientReleaseNotes'
copyright = u'2016, OpenStack Foundation'
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
+# Release notes are version independent.
# The short X.Y version.
-version = zaqarclient_version.version_string_with_vcs()
+version = ''
# The full version, including alpha/beta/rc tags.
-release = zaqarclient_version.canonical_version_string()
+release = ''
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-zaqarclient-1.7.0/releasenotes/source/index.rst
new/python-zaqarclient-1.8.0/releasenotes/source/index.rst
--- old/python-zaqarclient-1.7.0/releasenotes/source/index.rst 2017-07-28
09:38:46.000000000 +0200
+++ new/python-zaqarclient-1.8.0/releasenotes/source/index.rst 2017-12-18
13:53:16.000000000 +0100
@@ -13,6 +13,7 @@
:maxdepth: 1
unreleased
+ pike
ocata
OpenStack Releases
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-zaqarclient-1.7.0/releasenotes/source/pike.rst
new/python-zaqarclient-1.8.0/releasenotes/source/pike.rst
--- old/python-zaqarclient-1.7.0/releasenotes/source/pike.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/python-zaqarclient-1.8.0/releasenotes/source/pike.rst 2017-12-18
13:53:16.000000000 +0100
@@ -0,0 +1,6 @@
+===================================
+ Pike Series Release Notes
+===================================
+
+.. release-notes::
+ :branch: stable/pike
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-zaqarclient-1.7.0/requirements.txt
new/python-zaqarclient-1.8.0/requirements.txt
--- old/python-zaqarclient-1.7.0/requirements.txt 2017-07-28
09:38:46.000000000 +0200
+++ new/python-zaqarclient-1.8.0/requirements.txt 2017-12-18
13:53:16.000000000 +0100
@@ -3,14 +3,14 @@
# process, which may cause wedges in the gate later.
pbr!=2.1.0,>=2.0.0 # Apache-2.0
requests>=2.14.2 # Apache-2.0
-six>=1.9.0 # MIT
+six>=1.10.0 # MIT
stevedore>=1.20.0 # Apache-2.0
-jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
+jsonschema<3.0.0,>=2.6.0 # MIT
# Oslo Packages
-oslo.i18n!=3.15.2,>=2.1.0 # Apache-2.0
-oslo.log>=3.22.0 # Apache-2.0
-oslo.utils>=3.20.0 # Apache-2.0
+oslo.i18n>=3.15.3 # Apache-2.0
+oslo.log>=3.30.0 # Apache-2.0
+oslo.utils>=3.31.0 # Apache-2.0
-keystoneauth1>=3.0.1 # Apache-2.0
+keystoneauth1>=3.2.0 # Apache-2.0
osc-lib>=1.7.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-zaqarclient-1.7.0/test-requirements.txt
new/python-zaqarclient-1.8.0/test-requirements.txt
--- old/python-zaqarclient-1.7.0/test-requirements.txt 2017-07-28
09:38:46.000000000 +0200
+++ new/python-zaqarclient-1.8.0/test-requirements.txt 2017-12-18
13:53:16.000000000 +0100
@@ -6,14 +6,14 @@
# Unit testing
fixtures>=3.0.0 # Apache-2.0/BSD
-mock>=2.0 # BSD
-python-subunit>=0.0.18 # Apache-2.0/BSD
+mock>=2.0.0 # BSD
+python-subunit>=1.0.0 # Apache-2.0/BSD
testrepository>=0.0.18 # Apache-2.0/BSD
-testtools>=1.4.0 # MIT
+testtools>=2.2.0 # MIT
# Test runner
-nose # LGPL
-nose-exclude # LGPL
+nose>=1.3.7 # LGPL
+nose-exclude>=0.3.0 # LGPL
openstack.nose-plugin>=0.7 # Apache-2.0
# Metrics and style
@@ -24,6 +24,6 @@
# Documentation
sphinx>=1.6.2 # BSD
os-client-config>=1.28.0 # Apache-2.0
-openstackdocstheme>=1.11.0 # Apache-2.0
-reno!=2.3.1,>=1.8.0 # Apache-2.0
-requests-mock>=1.1 # Apache-2.0
+openstackdocstheme>=1.17.0 # Apache-2.0
+reno>=2.5.0 # Apache-2.0
+requests-mock>=1.1.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-zaqarclient-1.7.0/tools/tox_install.sh
new/python-zaqarclient-1.8.0/tools/tox_install.sh
--- old/python-zaqarclient-1.7.0/tools/tox_install.sh 2017-07-28
09:38:46.000000000 +0200
+++ new/python-zaqarclient-1.8.0/tools/tox_install.sh 1970-01-01
01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-# Client constraint file contains this client version pin that is in conflict
-# with installing the client from source. We should remove the version pin in
-# the constraints file before applying it for from-source installation.
-
-CONSTRAINTS_FILE="$1"
-shift 1
-
-set -e
-
-# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
-# published to logs.openstack.org for easy debugging.
-localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
-
-if [[ "$CONSTRAINTS_FILE" != http* ]]; then
- CONSTRAINTS_FILE="file://$CONSTRAINTS_FILE"
-fi
-# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
-curl "$CONSTRAINTS_FILE" --insecure --progress-bar --output "$localfile"
-
-pip install -c"$localfile" openstack-requirements
-
-# This is the main purpose of the script: Allow local installation of
-# the current repo. It is listed in constraints file and thus any
-# install will be constrained and we need to unconstrain it.
-edit-constraints "$localfile" -- "$CLIENT_NAME"
-
-pip install -c"$localfile" -U "$@"
-exit $?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-zaqarclient-1.7.0/tox.ini
new/python-zaqarclient-1.8.0/tox.ini
--- old/python-zaqarclient-1.7.0/tox.ini 2017-07-28 09:38:46.000000000
+0200
+++ new/python-zaqarclient-1.8.0/tox.ini 2017-12-18 13:53:16.000000000
+0100
@@ -6,17 +6,17 @@
[testenv]
usedevelop = True
# Customize pip command, add -U to force updates.
-install_command = {toxinidir}/tools/tox_install.sh
{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
{opts} {packages}
+install_command = pip install {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
- BRANCH_NAME=master
- CLIENT_NAME=python-zaqarclient
NOSE_WITH_OPENSTACK=1
NOSE_OPENSTACK_COLOR=1
NOSE_OPENSTACK_RED=0.05
NOSE_OPENSTACK_YELLOW=0.025
NOSE_OPENSTACK_SHOW_ELAPSED=1
NOSE_OPENSTACK_STDOUT=1
-deps = -r{toxinidir}/requirements.txt
+deps =
+
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+ -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = find . -type f -name "*.pyc" -delete
nosetests {posargs}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-zaqarclient-1.7.0/zaqarclient/queues/v1/cli.py
new/python-zaqarclient-1.8.0/zaqarclient/queues/v1/cli.py
--- old/python-zaqarclient-1.7.0/zaqarclient/queues/v1/cli.py 2017-07-28
09:38:46.000000000 +0200
+++ new/python-zaqarclient-1.8.0/zaqarclient/queues/v1/cli.py 2017-12-18
13:53:16.000000000 +0100
@@ -969,7 +969,7 @@
claim_obj = queue.claim(id=parsed_args.claim_id)
claim_obj.update(**kwargs)
- data = claim_obj._get()
+ data = claim_obj
keys = ("_id", "age", "ttl", "body")
columns = ("Message_ID", "Age", "TTL", "Message")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-zaqarclient-1.7.0/zaqarclient/queues/v1/message.py
new/python-zaqarclient-1.8.0/zaqarclient/queues/v1/message.py
--- old/python-zaqarclient-1.7.0/zaqarclient/queues/v1/message.py
2017-07-28 09:38:46.000000000 +0200
+++ new/python-zaqarclient-1.8.0/zaqarclient/queues/v1/message.py
2017-12-18 13:53:16.000000000 +0100
@@ -23,12 +23,13 @@
Attributes are only downloaded once - at creation time.
"""
def __init__(self, queue, ttl, age, body, href=None, id=None,
- claim_id=None):
+ claim_id=None, claim_count=0):
self.queue = queue
self.href = href
self.ttl = ttl
self.age = age
self.body = body
+ self.claim_count = claim_count
# NOTE(flaper87): Is this really
# necessary? Should this be returned
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-zaqarclient-1.7.0/zaqarclient/queues/v1/queues.py
new/python-zaqarclient-1.8.0/zaqarclient/queues/v1/queues.py
--- old/python-zaqarclient-1.7.0/zaqarclient/queues/v1/queues.py
2017-07-28 09:38:46.000000000 +0200
+++ new/python-zaqarclient-1.8.0/zaqarclient/queues/v1/queues.py
2017-12-18 13:53:16.000000000 +0100
@@ -39,6 +39,10 @@
:type client: `object`
:param name: Name of the queue.
:type name: `six.string_type`
+ :param href : Hypertext Reference.
+ :type href: `six.string_type`
+ :param metadata : A metadata object of the queue.
+ :type metadata: `dict`
:param auto_create: If create the queue automatically in database.
:type auto_create: `boolean`
:param force_create: If create the queue and skip the API version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-zaqarclient-1.7.0/zaqarclient/queues/v2/message.py
new/python-zaqarclient-1.8.0/zaqarclient/queues/v2/message.py
--- old/python-zaqarclient-1.7.0/zaqarclient/queues/v2/message.py
2017-07-28 09:38:46.000000000 +0200
+++ new/python-zaqarclient-1.8.0/zaqarclient/queues/v2/message.py
2017-12-18 13:53:16.000000000 +0100
@@ -19,12 +19,13 @@
class Message(message.Message):
def __init__(self, queue, ttl, age, body, href=None, id=None,
- claim_id=None):
+ claim_id=None, claim_count=0):
self.queue = queue
self.href = href
self.ttl = ttl
self.age = age
self.body = body
+ self.claim_count = claim_count
# NOTE(flaper87): Is this really
# necessary? Should this be returned
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-zaqarclient-1.7.0/zaqarclient/queues/v2/queues.py
new/python-zaqarclient-1.8.0/zaqarclient/queues/v2/queues.py
--- old/python-zaqarclient-1.7.0/zaqarclient/queues/v2/queues.py
2017-07-28 09:38:46.000000000 +0200
+++ new/python-zaqarclient-1.8.0/zaqarclient/queues/v2/queues.py
2017-12-18 13:53:16.000000000 +0100
@@ -62,7 +62,7 @@
changes = []
for key, value in new_meta.items():
# If key exists, replace it's value.
- if self._metadata.get(key, None):
+ if self._metadata.get(key, None) is not None:
changes.append({'op': 'replace',
'path': '/metadata/%s' % key,
'value': value})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-zaqarclient-1.7.0/zaqarclient/tests/base.py
new/python-zaqarclient-1.8.0/zaqarclient/tests/base.py
--- old/python-zaqarclient-1.7.0/zaqarclient/tests/base.py 2017-07-28
09:38:46.000000000 +0200
+++ new/python-zaqarclient-1.8.0/zaqarclient/tests/base.py 2017-12-18
13:53:16.000000000 +0100
@@ -75,22 +75,20 @@
def _setup_auth_params(self):
self.creds = self._credentials().get_auth_args()
- # FIXME(flwang): Now we're hardcode the keystone auth version, since
- # there is a 'bug' with the osc-config which is returning the auth_url
- # without version. This should be fixed as long as the bug is fixed.
parsed_url = urllib_parse.urlparse(self.creds['auth_url'])
auth_url = self.creds['auth_url']
if not parsed_url.path or parsed_url.path == '/':
- auth_url = urllib_parse.urljoin(self.creds['auth_url'], 'v2.0')
- if (parsed_url.path == '/identity_v2_admin' or
- parsed_url.path == '/identity'):
- auth_url = '%s/v2.0' % auth_url
+ auth_url = urllib_parse.urljoin(self.creds['auth_url'], 'v3')
+ if parsed_url.path == '/identity':
+ auth_url = '%s/v3' % auth_url
self.conf['auth_opts']['backend'] = 'keystone'
options = {'os_username': self.creds['username'],
+ 'os_user_domain_id': self.creds['user_domain_id'],
'os_password': self.creds['password'],
'os_project_name': self.creds['project_name'],
'os_project_id': '',
+ 'os_project_domain_id': self.creds['project_domain_id'],
'os_auth_url': auth_url}
self.conf['auth_opts'].setdefault('options', {}).update(options)
