Hello community,
here is the log from the commit of package python-glareclient for
openSUSE:Factory checked in at 2018-03-07 10:32:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-glareclient (Old)
and /work/SRC/openSUSE:Factory/.python-glareclient.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-glareclient"
Wed Mar 7 10:32:58 2018 rev:5 rq:579506 version:0.5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-glareclient/python-glareclient.changes
2018-01-24 15:26:49.264698513 +0100
+++
/work/SRC/openSUSE:Factory/.python-glareclient.new/python-glareclient.changes
2018-03-07 10:33:04.133960244 +0100
@@ -1,0 +2,14 @@
+Fri Feb 23 13:01:47 UTC 2018 - [email protected]
+
+- update to version 0.5.2
+ - Remove setting of version/release from releasenotes
+ - Allow to work in secure mode without certificate
+ - Look the list of artifacts in 'artifacts' section
+ - Avoid tox_install.sh for constraints support
+ - Rename -s option to -S
+ - Don't create client for help and bash completion
+ - Adopt new api for artifact listing
+ - Updated from global requirements
+- Switch to stable/queens spec template
+
+-------------------------------------------------------------------
Old:
----
python-glareclient-0.4.2.tar.gz
New:
----
python-glareclient-0.5.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-glareclient.spec ++++++
--- /var/tmp/diff_new_pack.fPEZOt/_old 2018-03-07 10:33:05.433913353 +0100
+++ /var/tmp/diff_new_pack.fPEZOt/_new 2018-03-07 10:33:05.433913353 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-glareclient
#
-# 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,7 +18,7 @@
%global sname python-glareclient
Name: python-glareclient
-Version: 0.4.2
+Version: 0.5.2
Release: 0
Summary: Python API and CLI for OpenStack Glare
License: Apache-2.0
@@ -32,9 +32,9 @@
BuildRequires: python-fixtures >= 3.0.0
BuildRequires: python-mock >= 2.0.0
BuildRequires: python-os-client-config >= 1.28.0
-BuildRequires: python-osc-lib >= 1.7.0
-BuildRequires: python-oslo.log >= 3.30.0
-BuildRequires: python-oslo.utils >= 3.31.0
+BuildRequires: python-osc-lib >= 1.8.0
+BuildRequires: python-oslo.log >= 3.36.0
+BuildRequires: python-oslo.utils >= 3.33.0
BuildRequires: python-reno >= 2.5.0
BuildRequires: python-requests-mock >= 1.1.0
BuildRequires: python-testrepository >= 0.0.18
@@ -42,11 +42,11 @@
BuildRequires: python-testtools >= 2.2.0
Requires: python-Babel >= 2.3.4
Requires: python-PrettyTable >= 0.7.1
-Requires: python-keystoneauth1 >= 3.2.0
-Requires: python-osc-lib >= 1.7.0
+Requires: python-keystoneauth1 >= 3.3.0
+Requires: python-osc-lib >= 1.8.0
Requires: python-oslo.i18n >= 3.15.3
-Requires: python-oslo.log >= 3.30.0
-Requires: python-oslo.utils >= 3.31.0
+Requires: python-oslo.log >= 3.36.0
+Requires: python-oslo.utils >= 3.33.0
Requires: python-pbr >= 2.0.0
Requires: python-requests >= 2.14.2
Requires: python-six >= 1.10.0
@@ -66,7 +66,7 @@
This package contains auto-generated documentation.
%prep
-%autosetup -n %{sname}-%{version}
+%autosetup -p1 -n %{sname}-%{version}
%py_req_cleanup
%build
++++++ _service ++++++
--- /var/tmp/diff_new_pack.fPEZOt/_old 2018-03-07 10:33:05.465912199 +0100
+++ /var/tmp/diff_new_pack.fPEZOt/_new 2018-03-07 10:33:05.465912199 +0100
@@ -1,8 +1,8 @@
<services>
<service mode="disabled" name="renderspec">
- <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/master/openstack/python-glareclient/python-glareclient.spec.j2</param>
+ <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/queens/openstack/python-glareclient/python-glareclient.spec.j2</param>
<param name="output-name">python-glareclient.spec</param>
- <param
name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/master/requirements.txt</param>
+ <param
name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/queens/requirements.txt</param>
<param name="changelog-email">[email protected]</param>
<param name="changelog-provider">gh,openstack,python-glareclient</param>
</service>
++++++ python-glareclient-0.4.2.tar.gz -> python-glareclient-0.5.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-glareclient-0.4.2/AUTHORS
new/python-glareclient-0.5.2/AUTHORS
--- old/python-glareclient-0.4.2/AUTHORS 2017-09-06 19:55:52.000000000
+0200
+++ new/python-glareclient-0.5.2/AUTHORS 2018-01-18 13:20:04.000000000
+0100
@@ -4,7 +4,9 @@
IlyaMenkov <[email protected]>
Mike Fedosin <[email protected]>
Mike Fedosin <[email protected]>
+Mike Fedosin <[email protected]>
Mike Fedosin <[email protected]>
Rui Yuan Dou <[email protected]>
Sergey Skripnick <[email protected]>
+Zuul <[email protected]>
ricolin <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-glareclient-0.4.2/ChangeLog
new/python-glareclient-0.5.2/ChangeLog
--- old/python-glareclient-0.4.2/ChangeLog 2017-09-06 19:55:52.000000000
+0200
+++ new/python-glareclient-0.5.2/ChangeLog 2018-01-18 13:20:04.000000000
+0100
@@ -1,6 +1,27 @@
CHANGES
=======
+0.5.2
+-----
+
+* Adopt new api for artifact listing
+* Rename -s option to -S
+
+0.5.1
+-----
+
+* Look the list of artifacts in 'artifacts' section
+* Avoid tox\_install.sh for constraints support
+* Remove setting of version/release from releasenotes
+* Updated from global requirements
+* Updated from global requirements
+
+0.5.0
+-----
+
+* Don't create client for help and bash completion
+* Allow to work in secure mode without certificate
+
0.4.2
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-glareclient-0.4.2/PKG-INFO
new/python-glareclient-0.5.2/PKG-INFO
--- old/python-glareclient-0.4.2/PKG-INFO 2017-09-06 19:55:53.000000000
+0200
+++ new/python-glareclient-0.5.2/PKG-INFO 2018-01-18 13:20:05.000000000
+0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: python-glareclient
-Version: 0.4.2
+Version: 0.5.2
Summary: Glare Artifact Repository
Home-page: http://docs.openstack.org/developer/python-glareclient
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-glareclient-0.4.2/glareclient/common/keycloak_auth.py
new/python-glareclient-0.5.2/glareclient/common/keycloak_auth.py
--- old/python-glareclient-0.4.2/glareclient/common/keycloak_auth.py
2017-09-06 19:53:26.000000000 +0200
+++ new/python-glareclient-0.5.2/glareclient/common/keycloak_auth.py
2018-01-18 13:17:09.000000000 +0100
@@ -65,7 +65,7 @@
verify = None
if urllib.parse.urlparse(access_token_endpoint).scheme == "https":
- verify = False if insecure else cacert
+ verify = False if insecure else cacert if cacert else True
body = {
'grant_type': 'password',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-glareclient-0.4.2/glareclient/osc/v1/artifacts.py
new/python-glareclient-0.5.2/glareclient/osc/v1/artifacts.py
--- old/python-glareclient-0.4.2/glareclient/osc/v1/artifacts.py
2017-09-06 19:53:26.000000000 +0200
+++ new/python-glareclient-0.5.2/glareclient/osc/v1/artifacts.py
2018-01-18 13:17:09.000000000 +0100
@@ -75,7 +75,7 @@
help='Filtering artifact list by a user-defined property.',
)
parser.add_argument(
- '--sort', '-s',
+ '--sort', '-S',
default='name:asc',
metavar='<key>[:<direction>]',
help='Comma-separated list of sort keys and directions in the '
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-glareclient-0.4.2/glareclient/shell.py
new/python-glareclient-0.5.2/glareclient/shell.py
--- old/python-glareclient-0.4.2/glareclient/shell.py 2017-09-06
19:53:26.000000000 +0200
+++ new/python-glareclient-0.5.2/glareclient/shell.py 2018-01-18
13:17:09.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright 2015 - StackStorm, Inc.
+# Copyright 2017 - Nokia Networks
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -261,17 +261,28 @@
self._clear_shell_commands()
self._set_shell_commands(self._get_commands())
- do_help = ('help' in argv) or ('-h' in argv) or not argv
+ # bash-completion and help messages should not require client creation
+ need_client = not (
+ ('bash-completion' in argv) or
+ ('help' in argv) or
+ ('-h' in argv) or
+ ('--help' in argv) or
+ not argv)
- # Set default for auth_url if not supplied. The default is not
- # set at the parser to support use cases where auth is not enabled.
- # An example use case would be a developer's environment.
+ self.client = self._create_client() if need_client else None
- # bash-completion should not require authentification.
- if do_help or ('bash-completion' in argv):
- self.options.auth_url = None
+ # Adding client_manager variable to make glare client work with
+ # unified OpenStack client.
+ ClientManager = type(
+ 'ClientManager',
+ (object,),
+ dict(artifact=self.client)
+ )
- self.client = client.Client(
+ self.client_manager = ClientManager()
+
+ def _create_client(self):
+ return client.Client(
endpoint=self.options.glare_url,
auth_token=self.options.auth_token,
keycloak_auth_url=self.options.keycloak_auth_url,
@@ -285,16 +296,6 @@
insecure=self.options.insecure
)
- # Adding client_manager variable to make glare client work with
- # unified OpenStack client.
- ClientManager = type(
- 'ClientManager',
- (object,),
- dict(artifact=self.client)
- )
-
- self.client_manager = ClientManager()
-
def _set_shell_commands(self, cmds_dict):
for k, v in cmds_dict.items():
self.command_manager.add_command(k, v)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-glareclient-0.4.2/glareclient/tests/unit/test_shell.py
new/python-glareclient-0.5.2/glareclient/tests/unit/test_shell.py
--- old/python-glareclient-0.4.2/glareclient/tests/unit/test_shell.py
1970-01-01 01:00:00.000000000 +0100
+++ new/python-glareclient-0.5.2/glareclient/tests/unit/test_shell.py
2018-01-18 13:17:09.000000000 +0100
@@ -0,0 +1,59 @@
+# Copyright 2015 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import mock
+import os
+import sys
+
+import six
+import testtools
+
+from glareclient import shell
+
+
+class TestShell(testtools.TestCase):
+
+ def shell(self, argstr):
+ orig = (sys.stdout, sys.stderr)
+ clean_env = {}
+ _old_env, os.environ = os.environ, clean_env.copy()
+
+ try:
+ sys.stdout = six.moves.cStringIO()
+ sys.stderr = six.moves.cStringIO()
+ _shell = shell.GlareShell()
+ _shell.run(argstr.split())
+ except SystemExit:
+ exc_type, exc_value, exc_traceback = sys.exc_info()
+ self.assertEqual(0, exc_value.code)
+ finally:
+ stdout = sys.stdout.getvalue()
+ stderr = sys.stderr.getvalue()
+ sys.stdout.close()
+ sys.stderr.close()
+ sys.stdout, sys.stderr = orig
+ os.environ = _old_env
+
+ return stdout, stderr
+
+ def test_help(self):
+ """Test that client is not created for help and bash complete"""
+ for command in ('-h',
+ '--help',
+ 'help',
+ 'help workbook-list',
+ 'bash-completion'):
+ with mock.patch('glareclient.client.Client') as client_mock:
+ self.shell(command)
+ self.assertFalse(client_mock.called)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-glareclient-0.4.2/glareclient/tests/unit/v1/test_artifacts.py
new/python-glareclient-0.5.2/glareclient/tests/unit/v1/test_artifacts.py
--- old/python-glareclient-0.4.2/glareclient/tests/unit/v1/test_artifacts.py
2017-09-06 19:53:26.000000000 +0200
+++ new/python-glareclient-0.5.2/glareclient/tests/unit/v1/test_artifacts.py
2018-01-18 13:17:09.000000000 +0100
@@ -70,7 +70,7 @@
'/artifacts/checked_name/test-id')
self.c._check_type_name.assert_called_once_with('test_name')
- def test_list(self):
+ def test_list_legacy(self):
self.mock_http_client.get.side_effect = [
(None, {'checked_name': [10, 11, 12], "next": "next1"}),
(None, {'checked_name': [13, 14, 15], "next": "next2"}),
@@ -79,6 +79,24 @@
]
data = list(self.c.list(type_name='test-type', limit=10, page_size=3))
expected = [10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
+ self.assertEqual(expected, data)
+ expected_calls = [
+ mock.call.get('/artifacts/checked_name?&limit=3'),
+ mock.call.get('next1'),
+ mock.call.get('next2'),
+ mock.call.get('next3'),
+ ]
+ self.assertEqual(expected_calls, self.mock_http_client.mock_calls)
+
+ def test_list(self):
+ self.mock_http_client.get.side_effect = [
+ (None, {'artifacts': [10, 11, 12], "next": "next1"}),
+ (None, {'artifacts': [13, 14, 15], "next": "next2"}),
+ (None, {'artifacts': [16, 17, 18], "next": "next3"}),
+ (None, {'artifacts': [19, 20, 21]}),
+ ]
+ data = list(self.c.list(type_name='test-type', limit=10, page_size=3))
+ expected = [10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
self.assertEqual(expected, data)
expected_calls = [
mock.call.get('/artifacts/checked_name?&limit=3'),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-glareclient-0.4.2/glareclient/v1/artifacts.py
new/python-glareclient-0.5.2/glareclient/v1/artifacts.py
--- old/python-glareclient-0.4.2/glareclient/v1/artifacts.py 2017-09-06
19:53:26.000000000 +0200
+++ new/python-glareclient-0.5.2/glareclient/v1/artifacts.py 2018-01-18
13:17:09.000000000 +0100
@@ -118,7 +118,7 @@
type_name = self._check_type_name(type_name)
url = '/artifacts/%s?version=%s&name=%s' % (type_name, version, name)
resp, body = self.http_client.get(url)
- arts = body[type_name]
+ arts = body.get('artifacts', body.get(type_name))
if not arts:
msg = ('Artifact with name=%s and version=%s not found.' %
(name, version))
@@ -138,7 +138,7 @@
' Please provide the concrete id from the list:\n%s' %
(name, version, output))
raise exc.BadRequest(msg)
- return body[type_name][0]
+ return arts[0]
def list(self, type_name=None, **kwargs):
"""Retrieve a listing of artifacts objects.
@@ -161,7 +161,11 @@
"limit=%s" % limit)
resp, body = self.http_client.get(next_url)
- for artifact in body[type_name]:
+
+ # For backward compatibility we also look for the list of
+ # artifacts under the type_name section.
+ # In current versions it should be located in 'artifacts'.
+ for artifact in body.get('artifacts', body.get(type_name)):
yield artifact
if limit:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-glareclient-0.4.2/python_glareclient.egg-info/PKG-INFO
new/python-glareclient-0.5.2/python_glareclient.egg-info/PKG-INFO
--- old/python-glareclient-0.4.2/python_glareclient.egg-info/PKG-INFO
2017-09-06 19:55:52.000000000 +0200
+++ new/python-glareclient-0.5.2/python_glareclient.egg-info/PKG-INFO
2018-01-18 13:20:04.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: python-glareclient
-Version: 0.4.2
+Version: 0.5.2
Summary: Glare Artifact Repository
Home-page: http://docs.openstack.org/developer/python-glareclient
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-glareclient-0.4.2/python_glareclient.egg-info/SOURCES.txt
new/python-glareclient-0.5.2/python_glareclient.egg-info/SOURCES.txt
--- old/python-glareclient-0.4.2/python_glareclient.egg-info/SOURCES.txt
2017-09-06 19:55:53.000000000 +0200
+++ new/python-glareclient-0.5.2/python_glareclient.egg-info/SOURCES.txt
2018-01-18 13:20:05.000000000 +0100
@@ -37,6 +37,7 @@
glareclient/tests/unit/fakes.py
glareclient/tests/unit/test_common_http.py
glareclient/tests/unit/test_progressbar.py
+glareclient/tests/unit/test_shell.py
glareclient/tests/unit/test_utils.py
glareclient/tests/unit/osc/__init__.py
glareclient/tests/unit/osc/test_plugin.py
@@ -73,5 +74,4 @@
releasenotes/source/_static/.placeholder
releasenotes/source/_templates/.placeholder
tools/glare.bash_completion
-tools/tox_install.sh
tools/with_venv.sh
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-glareclient-0.4.2/python_glareclient.egg-info/pbr.json
new/python-glareclient-0.5.2/python_glareclient.egg-info/pbr.json
--- old/python-glareclient-0.4.2/python_glareclient.egg-info/pbr.json
2017-09-06 19:55:52.000000000 +0200
+++ new/python-glareclient-0.5.2/python_glareclient.egg-info/pbr.json
2018-01-18 13:20:04.000000000 +0100
@@ -1 +1 @@
-{"git_version": "016653c", "is_release": true}
\ No newline at end of file
+{"git_version": "6da299f", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-glareclient-0.4.2/python_glareclient.egg-info/requires.txt
new/python-glareclient-0.5.2/python_glareclient.egg-info/requires.txt
--- old/python-glareclient-0.4.2/python_glareclient.egg-info/requires.txt
2017-09-06 19:55:52.000000000 +0200
+++ new/python-glareclient-0.5.2/python_glareclient.egg-info/requires.txt
2018-01-18 13:20:04.000000000 +0100
@@ -1,10 +1,10 @@
pbr!=2.1.0,>=2.0.0
Babel!=2.4.0,>=2.3.4
PrettyTable<0.8,>=0.7.1
-keystoneauth1>=2.21.0
+keystoneauth1>=3.2.0
requests>=2.14.2
six>=1.9.0
-oslo.utils>=3.20.0
-oslo.i18n!=3.15.2,>=2.1.0
-oslo.log>=3.22.0
-osc-lib>=1.5.1
+oslo.utils>=3.31.0
+oslo.i18n>=3.15.3
+oslo.log>=3.30.0
+osc-lib>=1.7.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-glareclient-0.4.2/releasenotes/source/conf.py
new/python-glareclient-0.5.2/releasenotes/source/conf.py
--- old/python-glareclient-0.4.2/releasenotes/source/conf.py 2017-09-06
19:53:26.000000000 +0200
+++ new/python-glareclient-0.5.2/releasenotes/source/conf.py 2018-01-18
13:17:09.000000000 +0100
@@ -58,17 +58,11 @@
project = u'glareclient Release Notes'
copyright = u'2016, Glare Developers'
-# 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.
-#
-# The short X.Y version.
-import pbr.version
+# Release notes are version independent.
# The full version, including alpha/beta/rc tags.
-glare_version = pbr.version.VersionInfo('glareclient')
-release = glare_version.version_string_with_vcs()
+release = ''
# The short X.Y version.
-version = glare_version.canonical_version_string()
+version = ''
# 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-glareclient-0.4.2/requirements.txt
new/python-glareclient-0.5.2/requirements.txt
--- old/python-glareclient-0.4.2/requirements.txt 2017-09-06
19:53:26.000000000 +0200
+++ new/python-glareclient-0.5.2/requirements.txt 2018-01-18
13:17:09.000000000 +0100
@@ -4,10 +4,10 @@
pbr!=2.1.0,>=2.0.0 # Apache-2.0
Babel!=2.4.0,>=2.3.4 # BSD
PrettyTable<0.8,>=0.7.1 # BSD
-keystoneauth1>=2.21.0 # Apache-2.0
+keystoneauth1>=3.2.0 # Apache-2.0
requests>=2.14.2 # Apache-2.0
six>=1.9.0 # MIT
-oslo.utils>=3.20.0 # Apache-2.0
-oslo.i18n!=3.15.2,>=2.1.0 # Apache-2.0
-oslo.log>=3.22.0 # Apache-2.0
-osc-lib>=1.5.1 # Apache-2.0
+oslo.utils>=3.31.0 # Apache-2.0
+oslo.i18n>=3.15.3 # Apache-2.0
+oslo.log>=3.30.0 # Apache-2.0
+osc-lib>=1.7.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-glareclient-0.4.2/test-requirements.txt
new/python-glareclient-0.5.2/test-requirements.txt
--- old/python-glareclient-0.4.2/test-requirements.txt 2017-09-06
19:53:26.000000000 +0200
+++ new/python-glareclient-0.5.2/test-requirements.txt 2018-01-18
13:17:09.000000000 +0100
@@ -4,14 +4,14 @@
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
-mock>=2.0 # BSD
-ordereddict # MIT
-os-client-config>=1.27.0 # Apache-2.0
+mock>=2.0.0 # BSD
+ordereddict>=1.1 # MIT
+os-client-config>=1.28.0 # Apache-2.0
oslosphinx>=4.7.0 # Apache-2.0
-reno!=2.3.1,>=1.8.0 # Apache-2.0
+reno>=2.5.0 # Apache-2.0
sphinx>=1.6.2 # BSD
testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=1.4.0 # MIT
testscenarios>=0.4 # Apache-2.0/BSD
fixtures>=3.0.0 # Apache-2.0/BSD
-requests-mock>=1.1 # Apache-2.0
+requests-mock>=1.1.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-glareclient-0.4.2/tools/tox_install.sh
new/python-glareclient-0.5.2/tools/tox_install.sh
--- old/python-glareclient-0.4.2/tools/tox_install.sh 2017-09-06
19:53:26.000000000 +0200
+++ new/python-glareclient-0.5.2/tools/tox_install.sh 1970-01-01
01:00:00.000000000 +0100
@@ -1,55 +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 replace the version pin in
-# the constraints file before applying it for from-source installation.
-
-ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
-BRANCH_NAME=master
-CLIENT_NAME=python-glareclient
-requirements_installed=$(echo "import openstack_requirements" | python
2>/dev/null ; echo $?)
-
-set -e
-
-CONSTRAINTS_FILE=$1
-shift
-
-install_cmd="pip install"
-if [ $CONSTRAINTS_FILE != "unconstrained" ]; then
-
- mydir=$(mktemp -dt "$CLIENT_NAME-tox_install-XXXXXXX")
- localfile=$mydir/upper-constraints.txt
- if [[ $CONSTRAINTS_FILE != http* ]]; then
- CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE
- fi
- curl $CONSTRAINTS_FILE -k -o $localfile
- install_cmd="$install_cmd -c$localfile"
-
- if [ $requirements_installed -eq 0 ]; then
- echo "ALREADY INSTALLED" > /tmp/tox_install.txt
- echo "Requirements already installed; using existing package"
- elif [ -x "$ZUUL_CLONER" ]; then
- export ZUUL_BRANCH=${ZUUL_BRANCH-$BRANCH}
- echo "ZUUL CLONER" > /tmp/tox_install.txt
- pushd $mydir
- $ZUUL_CLONER --cache-dir \
- /opt/git \
- --branch $BRANCH_NAME \
- git://git.openstack.org \
- openstack/requirements
- cd openstack/requirements
- $install_cmd -e .
- popd
- else
- echo "PIP HARDCODE" > /tmp/tox_install.txt
- if [ -z "$REQUIREMENTS_PIP_LOCATION" ]; then
-
REQUIREMENTS_PIP_LOCATION="git+https://git.openstack.org/openstack/requirements@$BRANCH_NAME#egg=requirements";
- fi
- $install_cmd -U -e ${REQUIREMENTS_PIP_LOCATION}
- fi
-
- edit-constraints $localfile -- $CLIENT_NAME "-e
file://$PWD#egg=$CLIENT_NAME"
-fi
-
-$install_cmd -U $*
-exit $?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-glareclient-0.4.2/tox.ini
new/python-glareclient-0.5.2/tox.ini
--- old/python-glareclient-0.4.2/tox.ini 2017-09-06 19:53:26.000000000
+0200
+++ new/python-glareclient-0.5.2/tox.ini 2018-01-18 13:17:09.000000000
+0100
@@ -5,15 +5,16 @@
[testenv]
usedevelop = True
-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}
OS_STDOUT_NOCAPTURE=False
OS_STDERR_NOCAPTURE=False
PYTHONHASHSEED=0
PYTHONDONTWRITEBYTECODE = 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 = python setup.py testr --testr-args='{posargs}'
