Hello community,
here is the log from the commit of package python-masakariclient for
openSUSE:Factory checked in at 2019-12-04 13:49:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-masakariclient (Old)
and /work/SRC/openSUSE:Factory/.python-masakariclient.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-masakariclient"
Wed Dec 4 13:49:13 2019 rev:6 rq:743550 version:5.5.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-masakariclient/python-masakariclient.changes
2019-05-03 22:41:15.851094634 +0200
+++
/work/SRC/openSUSE:Factory/.python-masakariclient.new.4691/python-masakariclient.changes
2019-12-04 14:19:04.162371841 +0100
@@ -1,0 +2,10 @@
+Wed Oct 9 13:02:37 UTC 2019 - [email protected]
+
+- update to version 5.5.0
+ - OpenDev Migration Patch
+ - Update master for stable/stein
+ - Replace git.openstack.org URLs with opendev.org URLs
+ - Add Python 3 Train unit tests
+ - [Gate Fix]Switch to stestr
+
+-------------------------------------------------------------------
Old:
----
python-masakariclient-5.4.0.tar.gz
New:
----
python-masakariclient-5.5.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-masakariclient.spec ++++++
--- /var/tmp/diff_new_pack.Mwji0M/_old 2019-12-04 14:19:04.530372151 +0100
+++ /var/tmp/diff_new_pack.Mwji0M/_new 2019-12-04 14:19:04.534372155 +0100
@@ -16,84 +16,114 @@
#
-%global sname python-masakariclient
+%global oldpython python
Name: python-masakariclient
-Version: 5.4.0
+Version: 5.5.0
Release: 0
Summary: Python API and CLI for OpenStack Masakari
License: Apache-2.0
Group: Development/Languages/Python
URL: https://launchpad.net/%{name}
-Source0:
https://files.pythonhosted.org/packages/source/p/%{sname}/%{sname}-%{version}.tar.gz
+Source0:
https://files.pythonhosted.org/packages/source/p/python-masakariclient/python-masakariclient-5.5.0.tar.gz
BuildRequires: openstack-macros
-BuildRequires: python-PrettyTable
-BuildRequires: python-ddt
-BuildRequires: python-nose
-BuildRequires: python-openstacksdk >= 0.13.0
-BuildRequires: python-osc-lib >= 1.8.0
-BuildRequires: python-oslo.serialization >= 2.18.0
-BuildRequires: python-oslo.utils
-BuildRequires: python-oslotest
-BuildRequires: python-python-subunit
-BuildRequires: python-reno
-BuildRequires: python-requests-mock
-BuildRequires: python-sphinx
-BuildRequires: python-testrepository
-BuildRequires: python-testscenarios
-BuildRequires: python-testtools
+BuildRequires: python2-PrettyTable
+BuildRequires: python2-ddt
+BuildRequires: python2-nose
+BuildRequires: python2-openstacksdk >= 0.13.0
+BuildRequires: python2-osc-lib >= 1.8.0
+BuildRequires: python2-oslo.serialization >= 2.18.0
+BuildRequires: python2-oslo.utils
+BuildRequires: python2-oslotest
+BuildRequires: python2-python-subunit
+BuildRequires: python2-requests-mock
+BuildRequires: python2-testrepository
+BuildRequires: python2-testscenarios
+BuildRequires: python2-testtools
+BuildRequires: python3-PrettyTable
+BuildRequires: python3-ddt
+BuildRequires: python3-nose
+BuildRequires: python3-openstacksdk >= 0.13.0
+BuildRequires: python3-osc-lib >= 1.8.0
+BuildRequires: python3-oslo.serialization >= 2.18.0
+BuildRequires: python3-oslo.utils
+BuildRequires: python3-oslotest
+BuildRequires: python3-python-subunit
+BuildRequires: python3-requests-mock
+BuildRequires: python3-testrepository
+BuildRequires: python3-testscenarios
+BuildRequires: python3-testtools
Requires: python-openstacksdk >= 0.13.0
Requires: python-oslo.i18n >= 3.15.3
Requires: python-oslo.serialization >= 2.18.0
Requires: python-oslo.utils
Requires: python-pbr >= 2.0.0
+Conflicts: %oldpython-masakariclient < %version
BuildArch: noarch
+%if 0%{?suse_version}
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
+%else
+# on RDO, update-alternatives is in chkconfig
+Requires(post): chkconfig
+Requires(postun): chkconfig
+%endif
+%python_subpackages
%description
Client library for Masakari built on the Masakari API. It provides a Python API
(the masakariclient module) and a command-line tool (masakari).
-%package doc
+%package -n python-masakariclient-doc
Summary: Documentation for OpenStack Masakari API client libary
Group: Documentation/HTML
-BuildRequires: python-Sphinx
-BuildRequires: python-oslosphinx
-BuildRequires: python-sphinxcontrib-apidoc
+BuildRequires: python3-Sphinx
+BuildRequires: python3-openstackdocstheme
+%if 0%{?suse_version}
+Obsoletes: %oldpython-masakariclient < %version
+%endif
-%description doc
+%description -n python-masakariclient-doc
Client library for Masakari built on the Masakari API. It provides a Python API
(the masakariclient module) and a command-line tool (masakari).
This package contains the documentation.
%prep
-%autosetup -p1 -n %{sname}-%{version}
+%autosetup -p1 -n python-masakariclient-%{version}
%py_req_cleanup
%build
-%py2_build
+%{python_build}
# Build HTML docs and man page
-PBR_VERSION=%{version} sphinx-build -b html doc/source doc/build/html
-PBR_VERSION=%{version} sphinx-build -b man doc/source doc/build/man
+PBR_VERSION=5.5.0 %sphinx_build -b html doc/source doc/build/html
+PBR_VERSION=5.5.0 %sphinx_build -b man doc/source doc/build/man
rm -r doc/build/html/.{doctrees,buildinfo}
%install
-%py2_install
+%{python_install}
+%python_clone -a %{buildroot}%{_bindir}/masakari
# man pages
install -p -D -m 644 doc/build/man/python-masakariclient.1
%{buildroot}%{_mandir}/man1/python-masakariclient.1
%check
find . -type f -name *.pyc -delete
-PYTHONPATH=. nosetests masakariclient/tests/unit
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib}
nosetests-%{$python_version} masakariclient/tests/unit
-%files
+%post
+%python_install_alternative masakari
+
+%postun
+%python_uninstall_alternative masakari
+
+%files %python_files
%license LICENSE
-%{python2_sitelib}/masakariclient
-%{python2_sitelib}/*.egg-info
-%{_mandir}/man1/python-masakariclient.1.*
-%{_bindir}/masakari
+%{python_sitelib}/masakariclient
+%{python_sitelib}/*.egg-info
+%python_alternative %{_bindir}/masakari
-%files doc
+%files -n python-masakariclient-doc
%license LICENSE
%doc doc/build/html
+%{_mandir}/man1/python-masakariclient.1.*
%changelog
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Mwji0M/_old 2019-12-04 14:19:04.558372175 +0100
+++ /var/tmp/diff_new_pack.Mwji0M/_new 2019-12-04 14:19:04.558372175 +0100
@@ -1,8 +1,8 @@
<services>
<service mode="disabled" name="renderspec">
- <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/stein/openstack/python-masakariclient/python-masakariclient.spec.j2</param>
+ <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/train/openstack/python-masakariclient/python-masakariclient.spec.j2</param>
<param name="output-name">python-masakariclient.spec</param>
- <param
name="requirements">https://raw.githubusercontent.com/openstack/python-masakariclient/stable/stein/requirements.txt</param>
+ <param
name="requirements">https://raw.githubusercontent.com/openstack/python-masakariclient/stable/train/requirements.txt</param>
<param name="changelog-email">[email protected]</param>
<param name="changelog-provider">gh,openstack,python-masakariclient</param>
</service>
++++++ python-masakariclient-5.4.0.tar.gz -> python-masakariclient-5.5.0.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-5.4.0/.stestr.conf
new/python-masakariclient-5.5.0/.stestr.conf
--- old/python-masakariclient-5.4.0/.stestr.conf 1970-01-01
01:00:00.000000000 +0100
+++ new/python-masakariclient-5.5.0/.stestr.conf 2019-09-12
11:33:03.000000000 +0200
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_path=./masakariclient/tests/unit
+top_dir=./
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-5.4.0/.testr.conf
new/python-masakariclient-5.5.0/.testr.conf
--- old/python-masakariclient-5.4.0/.testr.conf 2019-03-08 13:54:22.000000000
+0100
+++ new/python-masakariclient-5.5.0/.testr.conf 1970-01-01 01:00:00.000000000
+0100
@@ -1,7 +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:-60} \
- ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT
$IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-5.4.0/.zuul.yaml
new/python-masakariclient-5.5.0/.zuul.yaml
--- old/python-masakariclient-5.4.0/.zuul.yaml 2019-03-08 13:54:27.000000000
+0100
+++ new/python-masakariclient-5.5.0/.zuul.yaml 2019-09-12 11:33:03.000000000
+0200
@@ -3,7 +3,6 @@
- check-requirements
- openstack-lower-constraints-jobs
- openstack-python-jobs
- - openstack-python35-jobs
- - openstack-python36-jobs
+ - openstack-python3-train-jobs
- publish-openstack-docs-pti
- release-notes-jobs-python3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-5.4.0/AUTHORS
new/python-masakariclient-5.5.0/AUTHORS
--- old/python-masakariclient-5.4.0/AUTHORS 2019-03-08 13:56:32.000000000
+0100
+++ new/python-masakariclient-5.5.0/AUTHORS 2019-09-12 11:33:50.000000000
+0200
@@ -1,4 +1,5 @@
Andreas Jaeger <[email protected]>
+Corey Bryant <[email protected]>
Dinesh Bhor <[email protected]>
Doug Hellmann <[email protected]>
Keiji Niwa <[email protected]>
@@ -10,11 +11,13 @@
Rikimaru Honjo <[email protected]>
Takahiro Izumi <[email protected]>
ZhijunWei <[email protected]>
+akhiljain23 <[email protected]>
avnish <[email protected]>
bhagyashris <[email protected]>
dineshbhor <[email protected]>
ericxiett <[email protected]>
hussainchachuliya <[email protected]>
+jacky06 <[email protected]>
jayashri bidwe <[email protected]>
melissaml <[email protected]>
nehaalhat <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-5.4.0/ChangeLog
new/python-masakariclient-5.5.0/ChangeLog
--- old/python-masakariclient-5.4.0/ChangeLog 2019-03-08 13:56:32.000000000
+0100
+++ new/python-masakariclient-5.5.0/ChangeLog 2019-09-12 11:33:50.000000000
+0200
@@ -1,6 +1,15 @@
CHANGES
=======
+5.5.0
+-----
+
+* Add Python 3 Train unit tests
+* [Gate Fix]Switch to stestr
+* Replace git.openstack.org URLs with opendev.org URLs
+* OpenDev Migration Patch
+* Update master for stable/stein
+
5.4.0
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-5.4.0/PKG-INFO
new/python-masakariclient-5.5.0/PKG-INFO
--- old/python-masakariclient-5.4.0/PKG-INFO 2019-03-08 13:56:32.000000000
+0100
+++ new/python-masakariclient-5.5.0/PKG-INFO 2019-09-12 11:33:50.000000000
+0200
@@ -1,14 +1,14 @@
Metadata-Version: 1.1
Name: python-masakariclient
-Version: 5.4.0
+Version: 5.5.0
Summary: masakariclient module and a CLI tool for masakari
Home-page: http://www.openstack.org/
Author: OpenStack
Author-email: [email protected]
License: UNKNOWN
-Description: ===============================
+Description: =====================
python-masakariclient
- ===============================
+ =====================
masakariclient module and a CLI tool for masakari
@@ -18,8 +18,8 @@
* Free software: Apache license
* Documentation:
http://docs.openstack.org/developer/python-masakariclient
- * Source: http://git.openstack.org/cgit/openstack/python-masakariclient
- * Bugs: http://bugs.launchpad.net/python-masakariclient
+ * Source: https://opendev.org/openstack/python-masakariclient
+ * Bugs: https://bugs.launchpad.net/python-masakariclient
Features
--------
@@ -37,5 +37,5 @@
Classifier: Programming Language :: Python :: 2
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-5.4.0/README.rst
new/python-masakariclient-5.5.0/README.rst
--- old/python-masakariclient-5.4.0/README.rst 2019-03-08 13:54:22.000000000
+0100
+++ new/python-masakariclient-5.5.0/README.rst 2019-09-12 11:33:07.000000000
+0200
@@ -1,6 +1,6 @@
-===============================
+=====================
python-masakariclient
-===============================
+=====================
masakariclient module and a CLI tool for masakari
@@ -10,8 +10,8 @@
* Free software: Apache license
* Documentation: http://docs.openstack.org/developer/python-masakariclient
-* Source: http://git.openstack.org/cgit/openstack/python-masakariclient
-* Bugs: http://bugs.launchpad.net/python-masakariclient
+* Source: https://opendev.org/openstack/python-masakariclient
+* Bugs: https://bugs.launchpad.net/python-masakariclient
Features
--------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-5.4.0/doc/source/conf.py
new/python-masakariclient-5.5.0/doc/source/conf.py
--- old/python-masakariclient-5.4.0/doc/source/conf.py 2019-03-08
13:54:22.000000000 +0100
+++ new/python-masakariclient-5.5.0/doc/source/conf.py 2019-09-12
11:33:03.000000000 +0200
@@ -21,9 +21,9 @@
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = [
- 'sphinx.ext.autodoc',
+ 'openstackdocstheme',
+ 'sphinx.ext.autodoc'
#'sphinx.ext.intersphinx',
- 'oslosphinx'
]
# autodoc generation is a bit aggressive and a nuisance when doing heavy
@@ -55,7 +55,7 @@
# The theme to use for HTML and HTML Help pages. Major themes that come with
# Sphinx are currently 'default' and 'sphinxdoc'.
# html_theme_path = ["."]
-# html_theme = '_theme'
+html_theme = 'openstackdocs'
# html_static_path = ['static']
# Output file base name for HTML help builder.
@@ -73,3 +73,10 @@
# Example configuration for intersphinx: refer to the Python standard library.
#intersphinx_mapping = {'http://docs.python.org/': None}
+
+# -- Options for openstackdocstheme ---------------------------------------
+
+repository_name = 'openstack/python-masakariclient'
+bug_project = 'python-masakariclient'
+bug_tag = ''
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-5.4.0/doc/source/index.rst
new/python-masakariclient-5.5.0/doc/source/index.rst
--- old/python-masakariclient-5.4.0/doc/source/index.rst 2019-03-08
13:54:22.000000000 +0100
+++ new/python-masakariclient-5.5.0/doc/source/index.rst 2019-09-12
11:33:07.000000000 +0200
@@ -4,7 +4,7 @@
contain the root `toctree` directive.
Welcome to python-masakariclient's documentation!
-========================================================
+=================================================
Contents:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-5.4.0/doc/source/usage.rst
new/python-masakariclient-5.5.0/doc/source/usage.rst
--- old/python-masakariclient-5.4.0/doc/source/usage.rst 2019-03-08
13:54:22.000000000 +0100
+++ new/python-masakariclient-5.5.0/doc/source/usage.rst 2019-09-12
11:33:07.000000000 +0200
@@ -1,6 +1,6 @@
-========
+=====
Usage
-========
+=====
To use python-masakariclient in a project::
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-5.4.0/lower-constraints.txt
new/python-masakariclient-5.5.0/lower-constraints.txt
--- old/python-masakariclient-5.4.0/lower-constraints.txt 2019-03-08
13:54:22.000000000 +0100
+++ new/python-masakariclient-5.5.0/lower-constraints.txt 2019-09-12
11:33:03.000000000 +0200
@@ -33,15 +33,14 @@
munch==2.1.0
netaddr==0.7.18
netifaces==0.10.4
+openstackdocstheme==1.18.1
openstacksdk==0.13.0
os-client-config==1.28.0
os-service-types==1.2.0
-os-testr==1.0.0
osc-lib==1.8.0
oslo.i18n==3.15.3
oslo.serialization==2.18.0
oslo.utils==3.33.0
-oslosphinx==4.7.0
oslotest==3.2.0
pbr==2.0.0
pep8==1.5.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-5.4.0/python_masakariclient.egg-info/PKG-INFO
new/python-masakariclient-5.5.0/python_masakariclient.egg-info/PKG-INFO
--- old/python-masakariclient-5.4.0/python_masakariclient.egg-info/PKG-INFO
2019-03-08 13:56:32.000000000 +0100
+++ new/python-masakariclient-5.5.0/python_masakariclient.egg-info/PKG-INFO
2019-09-12 11:33:50.000000000 +0200
@@ -1,14 +1,14 @@
Metadata-Version: 1.1
Name: python-masakariclient
-Version: 5.4.0
+Version: 5.5.0
Summary: masakariclient module and a CLI tool for masakari
Home-page: http://www.openstack.org/
Author: OpenStack
Author-email: [email protected]
License: UNKNOWN
-Description: ===============================
+Description: =====================
python-masakariclient
- ===============================
+ =====================
masakariclient module and a CLI tool for masakari
@@ -18,8 +18,8 @@
* Free software: Apache license
* Documentation:
http://docs.openstack.org/developer/python-masakariclient
- * Source: http://git.openstack.org/cgit/openstack/python-masakariclient
- * Bugs: http://bugs.launchpad.net/python-masakariclient
+ * Source: https://opendev.org/openstack/python-masakariclient
+ * Bugs: https://bugs.launchpad.net/python-masakariclient
Features
--------
@@ -37,5 +37,5 @@
Classifier: Programming Language :: Python :: 2
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-5.4.0/python_masakariclient.egg-info/SOURCES.txt
new/python-masakariclient-5.5.0/python_masakariclient.egg-info/SOURCES.txt
--- old/python-masakariclient-5.4.0/python_masakariclient.egg-info/SOURCES.txt
2019-03-08 13:56:32.000000000 +0100
+++ new/python-masakariclient-5.5.0/python_masakariclient.egg-info/SOURCES.txt
2019-09-12 11:33:50.000000000 +0200
@@ -1,6 +1,6 @@
.coveragerc
.mailmap
-.testr.conf
+.stestr.conf
.zuul.yaml
AUTHORS
CONTRIBUTING.rst
@@ -69,6 +69,7 @@
releasenotes/source/conf.py
releasenotes/source/index.rst
releasenotes/source/rocky.rst
+releasenotes/source/stein.rst
releasenotes/source/unreleased.rst
releasenotes/source/_static/.placeholder
releasenotes/source/_templates/.placeholder
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-5.4.0/python_masakariclient.egg-info/pbr.json
new/python-masakariclient-5.5.0/python_masakariclient.egg-info/pbr.json
--- old/python-masakariclient-5.4.0/python_masakariclient.egg-info/pbr.json
2019-03-08 13:56:32.000000000 +0100
+++ new/python-masakariclient-5.5.0/python_masakariclient.egg-info/pbr.json
2019-09-12 11:33:50.000000000 +0200
@@ -1 +1 @@
-{"git_version": "96613b9", "is_release": true}
\ No newline at end of file
+{"git_version": "1702880", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-5.4.0/releasenotes/source/conf.py
new/python-masakariclient-5.5.0/releasenotes/source/conf.py
--- old/python-masakariclient-5.4.0/releasenotes/source/conf.py 2019-03-08
13:54:22.000000000 +0100
+++ new/python-masakariclient-5.5.0/releasenotes/source/conf.py 2019-09-12
11:33:03.000000000 +0200
@@ -38,7 +38,7 @@
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
- 'oslosphinx',
+ 'openstackdocstheme',
'reno.sphinxext',
]
@@ -111,7 +111,7 @@
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
-html_theme = 'default'
+html_theme = 'openstackdocs'
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
@@ -191,6 +191,11 @@
# Output file base name for HTML help builder.
htmlhelp_basename = 'MasakariClientReleaseNotesdoc'
+# -- Options for openstackdocstheme ---------------------------------------
+
+repository_name = 'openstack/python-masakariclient'
+bug_project = 'python-masakariclient'
+bug_tag = ''
# -- Options for LaTeX output ---------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-5.4.0/releasenotes/source/index.rst
new/python-masakariclient-5.5.0/releasenotes/source/index.rst
--- old/python-masakariclient-5.4.0/releasenotes/source/index.rst
2019-03-08 13:54:22.000000000 +0100
+++ new/python-masakariclient-5.5.0/releasenotes/source/index.rst
2019-09-12 11:33:03.000000000 +0200
@@ -6,4 +6,5 @@
:maxdepth: 1
unreleased
+ stein
rocky
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-masakariclient-5.4.0/releasenotes/source/stein.rst
new/python-masakariclient-5.5.0/releasenotes/source/stein.rst
--- old/python-masakariclient-5.4.0/releasenotes/source/stein.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/python-masakariclient-5.5.0/releasenotes/source/stein.rst
2019-09-12 11:33:03.000000000 +0200
@@ -0,0 +1,6 @@
+===================================
+ Stein Series Release Notes
+===================================
+
+.. release-notes::
+ :branch: stable/stein
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-5.4.0/setup.cfg
new/python-masakariclient-5.5.0/setup.cfg
--- old/python-masakariclient-5.4.0/setup.cfg 2019-03-08 13:56:32.000000000
+0100
+++ new/python-masakariclient-5.5.0/setup.cfg 2019-09-12 11:33:50.000000000
+0200
@@ -16,8 +16,8 @@
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
- Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
+ Programming Language :: Python :: 3.7
[files]
packages =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-5.4.0/test-requirements.txt
new/python-masakariclient-5.5.0/test-requirements.txt
--- old/python-masakariclient-5.4.0/test-requirements.txt 2019-03-08
13:54:22.000000000 +0100
+++ new/python-masakariclient-5.5.0/test-requirements.txt 2019-09-12
11:33:03.000000000 +0200
@@ -7,12 +7,12 @@
coverage!=4.4,>=4.0 # Apache-2.0
ddt>=1.0.1 # MIT
python-subunit>=1.0.0 # Apache-2.0/BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
-oslosphinx>=4.7.0 # Apache-2.0
+openstackdocstheme>=1.18.1 # Apache-2.0
oslotest>=3.2.0 # Apache-2.0
-os-testr>=1.0.0 # Apache-2.0
requests-mock>=1.2.0 # Apache-2.0
-testrepository>=0.0.18 # Apache-2.0/BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
+stestr>=1.0.0 # Apache-2.0
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=2.2.0 # MIT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-masakariclient-5.4.0/tox.ini
new/python-masakariclient-5.5.0/tox.ini
--- old/python-masakariclient-5.4.0/tox.ini 2019-03-08 13:54:22.000000000
+0100
+++ new/python-masakariclient-5.5.0/tox.ini 2019-09-12 11:33:07.000000000
+0200
@@ -1,43 +1,42 @@
[tox]
minversion = 2.0
-envlist = pep8,py27,py35,py36
+envlist = pep8,py27,py36,py37
skipsdist = True
[testenv]
usedevelop = True
install_command = pip install {opts} {packages}
deps =
-
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt
whitelist_externals = bash
find
rm
env
-# By default ostestr will set concurrency
+# By default stestr will set concurrency
# to ncpu, to specify something else use
# the concurrency=<n> option.
# call ie: 'tox -epy27 -- --concurrency=4'
commands =
find . -type f -name "*.pyc" -delete
- rm -Rf .testrepository/times.dbm
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
OS_DEBUG GENERATE_HASHES
[testenv:py27]
commands =
{[testenv]commands}
- ostestr '{posargs}'
+ stestr run {posargs}
-[testenv:py35]
-basepython = python3
+[testenv:py36]
+basepython = python3.6
commands =
{[testenv]commands}
- ostestr '{posargs}'
+ stestr run {posargs}
-[testenv:py36]
-basepython = python3.6
+[testenv:py37]
+basepython = python3.7
commands =
{[testenv]commands}
- ostestr '{posargs}'
+ stestr run {posargs}
[testenv:pep8]
basepython = python3
@@ -49,7 +48,13 @@
[testenv:cover]
basepython = python3
-commands = python setup.py test --coverage --testr-args='{posargs}'
+setenv =
+ PYTHON=coverage run --source masakariclient --parallel-mode
+commands =
+ stestr run {posargs}
+ coverage combine
+ coverage html -d cover
+ coverage xml -o cover/coverage.xml
[testenv:docs]
basepython = python3