Hello community,
here is the log from the commit of package python-oslo.rootwrap for
openSUSE:Factory checked in at 2020-06-05 20:15:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-oslo.rootwrap (Old)
and /work/SRC/openSUSE:Factory/.python-oslo.rootwrap.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.rootwrap"
Fri Jun 5 20:15:05 2020 rev:12 rq:803598 version:6.0.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-oslo.rootwrap/python-oslo.rootwrap.changes
2020-03-29 14:25:44.878099119 +0200
+++
/work/SRC/openSUSE:Factory/.python-oslo.rootwrap.new.3606/python-oslo.rootwrap.changes
2020-06-05 20:19:13.635665136 +0200
@@ -1,0 +2,19 @@
+Tue May 12 09:48:16 UTC 2020 - [email protected]
+
+- update to version 6.0.2
+ - Update the constraints url
+ - Sync Sphinx requirement
+ - [ussuri][goal] Drop python 2.7 support and testing
+ - remove outdated header
+ - Switch to Ussuri jobs
+ - Implement "realpath" to retrieve the real absolute path
+ - Remove universal wheel configuration
+ - Use unittest.mock instead of third party mock
+ - Bump the openstackdocstheme extension to 1.20
+ - tox: Trivial cleanup
+ - tox: Keeping going with docs
+ - Update master for stable/train
+ - reword releasenote for py27 support dropping
+ - reap rootwrap daemon process when it is timeout
+
+-------------------------------------------------------------------
Old:
----
oslo.rootwrap-5.16.1.tar.gz
New:
----
oslo.rootwrap-6.0.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-oslo.rootwrap.spec ++++++
--- /var/tmp/diff_new_pack.mbRY5W/_old 2020-06-05 20:19:15.427671229 +0200
+++ /var/tmp/diff_new_pack.mbRY5W/_new 2020-06-05 20:19:15.431671243 +0200
@@ -17,13 +17,13 @@
Name: python-oslo.rootwrap
-Version: 5.16.1
+Version: 6.0.2
Release: 0
Summary: Filtering shell commands to run as root from OpenStack services
License: Apache-2.0
Group: Development/Languages/Python
URL: https://launchpad.net/oslo.rootwrap
-Source0:
https://files.pythonhosted.org/packages/source/o/oslo.rootwrap/oslo.rootwrap-5.16.1.tar.gz
+Source0:
https://files.pythonhosted.org/packages/source/o/oslo.rootwrap/oslo.rootwrap-6.0.2.tar.gz
BuildRequires: openstack-macros
BuildRequires: python3-eventlet
BuildRequires: python3-fixtures
@@ -68,14 +68,14 @@
Documentation for the OpenStack oslo.rootwrap library.
%prep
-%autosetup -p1 -n oslo.rootwrap-5.16.1
+%autosetup -p1 -n oslo.rootwrap-6.0.2
%py_req_cleanup
%build
%{py3_build}
# generate html docs
-PBR_VERSION=5.16.1 %sphinx_build -b html doc/source doc/build/html
+PBR_VERSION=6.0.2 %sphinx_build -b html doc/source doc/build/html
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
++++++ _service ++++++
--- /var/tmp/diff_new_pack.mbRY5W/_old 2020-06-05 20:19:15.467671365 +0200
+++ /var/tmp/diff_new_pack.mbRY5W/_new 2020-06-05 20:19:15.471671379 +0200
@@ -1,8 +1,8 @@
<services>
<service mode="disabled" name="renderspec">
- <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/train/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2</param>
+ <param
name="input-template">https://opendev.org/openstack/rpm-packaging/raw/branch/stable/ussuri/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2</param>
<param name="output-name">python-oslo.rootwrap.spec</param>
- <param
name="requirements">https://raw.githubusercontent.com/openstack/oslo.rootwrap/stable/train/requirements.txt</param>
+ <param
name="requirements">https://opendev.org/openstack/oslo.rootwrap/raw/branch/stable/ussuri/requirements.txt</param>
<param name="changelog-email">[email protected]</param>
<param name="changelog-provider">gh,openstack,oslo.rootwrap</param>
</service>
++++++ oslo.rootwrap-5.16.1.tar.gz -> oslo.rootwrap-6.0.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.16.1/.zuul.yaml
new/oslo.rootwrap-6.0.2/.zuul.yaml
--- old/oslo.rootwrap-5.16.1/.zuul.yaml 2019-09-04 16:25:31.000000000 +0200
+++ new/oslo.rootwrap-6.0.2/.zuul.yaml 2020-04-07 12:06:58.000000000 +0200
@@ -1,11 +1,9 @@
- project:
templates:
- check-requirements
- - lib-forward-testing
- lib-forward-testing-python3
- openstack-lower-constraints-jobs
- - openstack-python-jobs
- - openstack-python3-train-jobs
+ - openstack-python3-ussuri-jobs
- periodic-stable-jobs
- publish-openstack-docs-pti
- release-notes-jobs-python3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.16.1/AUTHORS
new/oslo.rootwrap-6.0.2/AUTHORS
--- old/oslo.rootwrap-5.16.1/AUTHORS 2019-09-04 16:26:16.000000000 +0200
+++ new/oslo.rootwrap-6.0.2/AUTHORS 2020-04-07 12:08:05.000000000 +0200
@@ -19,10 +19,12 @@
Doug Hellmann <[email protected]>
Flavio Percoco <[email protected]>
Ghanshyam Mann <[email protected]>
+Hervé Beraud <[email protected]>
IWAMOTO Toshihiro <[email protected]>
Ihar Hrachyshka <[email protected]>
Jakub Libosvar <[email protected]>
James Carey <[email protected]>
+Jeffrey Zhang <[email protected]>
Jeremy Stanley <[email protected]>
Julien Danjou <[email protected]>
Kenneth Giusti <[email protected]>
@@ -35,9 +37,11 @@
OpenStack Release Bot <[email protected]>
Pádraig Brady <[email protected]>
Ralf Haferkamp <[email protected]>
+Rodolfo Alonso Hernandez <[email protected]>
Roman Podolyaka <[email protected]>
Ronald Bradford <[email protected]>
Sean Dague <[email protected]>
+Sean McGinnis <[email protected]>
Sean McGinnis <[email protected]>
Sergey Kraynev <[email protected]>
Sergey Lukjanov <[email protected]>
@@ -60,10 +64,12 @@
Zhao Lei <[email protected]>
ZhongShengping <[email protected]>
Zhongyue Luo <[email protected]>
+caoyuan <[email protected]>
fumihiko kakuma <[email protected]>
howardlee <[email protected]>
jacky06 <[email protected]>
melissaml <[email protected]>
+pengyuesheng <[email protected]>
ricolin <[email protected]>
sonu.kumar <[email protected]>
yan.haifeng <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.16.1/ChangeLog
new/oslo.rootwrap-6.0.2/ChangeLog
--- old/oslo.rootwrap-5.16.1/ChangeLog 2019-09-04 16:26:16.000000000 +0200
+++ new/oslo.rootwrap-6.0.2/ChangeLog 2020-04-07 12:08:05.000000000 +0200
@@ -1,6 +1,40 @@
CHANGES
=======
+6.0.2
+-----
+
+* Use unittest.mock instead of third party mock
+
+6.0.1
+-----
+
+* Implement "realpath" to retrieve the real absolute path
+* remove outdated header
+* Remove universal wheel configuration
+* reword releasenote for py27 support dropping
+
+6.0.0
+-----
+
+* [ussuri][goal] Drop python 2.7 support and testing
+* tox: Trivial cleanup
+
+5.17.1
+------
+
+* reap rootwrap daemon process when it is timeout
+* tox: Keeping going with docs
+* Switch to Ussuri jobs
+* Bump the openstackdocstheme extension to 1.20
+* Sync Sphinx requirement
+* Update the constraints url
+
+5.17.0
+------
+
+* Update master for stable/train
+
5.16.1
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.16.1/PKG-INFO
new/oslo.rootwrap-6.0.2/PKG-INFO
--- old/oslo.rootwrap-5.16.1/PKG-INFO 2019-09-04 16:26:16.000000000 +0200
+++ new/oslo.rootwrap-6.0.2/PKG-INFO 2020-04-07 12:08:05.000000000 +0200
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
Name: oslo.rootwrap
-Version: 5.16.1
+Version: 6.0.2
Summary: Oslo Rootwrap
Home-page: https://docs.openstack.org/oslo.rootwrap/latest/
Author: OpenStack
@@ -45,7 +45,9 @@
Classifier: License :: OSI Approved :: Apache Software License
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Requires-Python: >=3.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.16.1/doc/requirements.txt
new/oslo.rootwrap-6.0.2/doc/requirements.txt
--- old/oslo.rootwrap-5.16.1/doc/requirements.txt 2019-09-04
16:25:31.000000000 +0200
+++ new/oslo.rootwrap-6.0.2/doc/requirements.txt 2020-04-07
12:06:58.000000000 +0200
@@ -2,8 +2,8 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
# These are needed for docs generation
-openstackdocstheme>=1.18.1 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+openstackdocstheme>=1.20.0 # Apache-2.0
+sphinx>=1.8.0,!=2.1.0 # BSD
reno>=2.5.0 # Apache-2.0
mock>=2.0.0 # BSD
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.16.1/doc/source/conf.py
new/oslo.rootwrap-6.0.2/doc/source/conf.py
--- old/oslo.rootwrap-5.16.1/doc/source/conf.py 2019-09-04 16:25:31.000000000
+0200
+++ new/oslo.rootwrap-6.0.2/doc/source/conf.py 2020-04-07 12:06:58.000000000
+0200
@@ -64,8 +64,6 @@
# html_static_path = ['static']
html_theme = 'openstackdocs'
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
# Output file base name for HTML help builder.
htmlhelp_basename = '%sdoc' % project
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.16.1/lower-constraints.txt
new/oslo.rootwrap-6.0.2/lower-constraints.txt
--- old/oslo.rootwrap-5.16.1/lower-constraints.txt 2019-09-04
16:25:31.000000000 +0200
+++ new/oslo.rootwrap-6.0.2/lower-constraints.txt 2020-04-07
12:06:58.000000000 +0200
@@ -19,9 +19,8 @@
linecache2==1.0.0
MarkupSafe==1.0
mccabe==0.2.1
-mock==2.0.0
mox3==0.20.0
-openstackdocstheme==1.18.1
+openstackdocstheme==1.20.0
os-client-config==1.28.0
oslotest==3.2.0
pbr==2.0.0
@@ -38,7 +37,7 @@
six==1.10.0
smmap==0.9.0
snowballstemmer==1.2.1
-Sphinx==1.6.2
+Sphinx==1.8.0
sphinxcontrib-websupport==1.0.1
stestr==2.0.0
stevedore==1.20.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.16.1/oslo.rootwrap.egg-info/PKG-INFO
new/oslo.rootwrap-6.0.2/oslo.rootwrap.egg-info/PKG-INFO
--- old/oslo.rootwrap-5.16.1/oslo.rootwrap.egg-info/PKG-INFO 2019-09-04
16:26:16.000000000 +0200
+++ new/oslo.rootwrap-6.0.2/oslo.rootwrap.egg-info/PKG-INFO 2020-04-07
12:08:05.000000000 +0200
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
Name: oslo.rootwrap
-Version: 5.16.1
+Version: 6.0.2
Summary: Oslo Rootwrap
Home-page: https://docs.openstack.org/oslo.rootwrap/latest/
Author: OpenStack
@@ -45,7 +45,9 @@
Classifier: License :: OSI Approved :: Apache Software License
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Requires-Python: >=3.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.rootwrap-5.16.1/oslo.rootwrap.egg-info/SOURCES.txt
new/oslo.rootwrap-6.0.2/oslo.rootwrap.egg-info/SOURCES.txt
--- old/oslo.rootwrap-5.16.1/oslo.rootwrap.egg-info/SOURCES.txt 2019-09-04
16:26:16.000000000 +0200
+++ new/oslo.rootwrap-6.0.2/oslo.rootwrap.egg-info/SOURCES.txt 2020-04-07
12:08:05.000000000 +0200
@@ -45,7 +45,9 @@
oslo_rootwrap/tests/test_functional_eventlet.py
oslo_rootwrap/tests/test_rootwrap.py
releasenotes/notes/add_reno-3b4ae0789e9c45b4.yaml
+releasenotes/notes/drop-python27-support-a4d3707304c73df6.yaml
releasenotes/notes/file-descriptor-limit-e2b2a3033b9ef21e.yaml
+releasenotes/notes/reap-rootwrap-daemon-process-60aebb56d8015484.yaml
releasenotes/source/conf.py
releasenotes/source/index.rst
releasenotes/source/ocata.rst
@@ -53,6 +55,7 @@
releasenotes/source/queens.rst
releasenotes/source/rocky.rst
releasenotes/source/stein.rst
+releasenotes/source/train.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/oslo.rootwrap-5.16.1/oslo.rootwrap.egg-info/pbr.json
new/oslo.rootwrap-6.0.2/oslo.rootwrap.egg-info/pbr.json
--- old/oslo.rootwrap-5.16.1/oslo.rootwrap.egg-info/pbr.json 2019-09-04
16:26:16.000000000 +0200
+++ new/oslo.rootwrap-6.0.2/oslo.rootwrap.egg-info/pbr.json 2020-04-07
12:08:05.000000000 +0200
@@ -1 +1 @@
-{"git_version": "c6babc7", "is_release": true}
\ No newline at end of file
+{"git_version": "fd21b6e", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.16.1/oslo_rootwrap/client.py
new/oslo.rootwrap-6.0.2/oslo_rootwrap/client.py
--- old/oslo.rootwrap-5.16.1/oslo_rootwrap/client.py 2019-09-04
16:25:31.000000000 +0200
+++ new/oslo.rootwrap-6.0.2/oslo_rootwrap/client.py 2020-04-07
12:06:58.000000000 +0200
@@ -85,6 +85,15 @@
(stderr,))
LOG.info("Spawned new rootwrap daemon process with pid=%d",
process_obj.pid)
+
+ def wait_process():
+ return_code = process_obj.wait()
+ LOG.info("Rootwrap daemon process exit with status: %d",
+ return_code)
+
+ reap_process = threading.Thread(target=wait_process)
+ reap_process.daemon = True
+ reap_process.start()
self._manager = ClientManager(socket_path, authkey)
self._manager.connect()
self._proxy = self._manager.rootwrap()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.16.1/oslo_rootwrap/filters.py
new/oslo.rootwrap-6.0.2/oslo_rootwrap/filters.py
--- old/oslo.rootwrap-5.16.1/oslo_rootwrap/filters.py 2019-09-04
16:25:31.000000000 +0200
+++ new/oslo.rootwrap-6.0.2/oslo_rootwrap/filters.py 2020-04-07
12:06:58.000000000 +0200
@@ -33,6 +33,19 @@
return pwd.getpwnam(user).pw_uid
+def realpath(path):
+ """Return the real absolute path.
+
+ If the execution directory does not exist, os.getcwd() raises a
+ FileNotFoundError exception. In this case, unset the exception and return
+ an empty string.
+ """
+ try:
+ return os.path.realpath(path)
+ except FileNotFoundError:
+ return ''
+
+
class CommandFilter(object):
"""Command filter only checking that the 1st argument matches exec_path."""
@@ -128,7 +141,7 @@
if not os.path.isabs(arg) # arguments not specifying abs paths
)
paths_are_within_base_dirs = all(
- os.path.commonprefix([arg, os.path.realpath(value)]) == arg
+ os.path.commonprefix([arg, realpath(value)]) == arg
for arg, value in zip(self.args, arguments)
if os.path.isabs(arg) # arguments specifying abs paths
)
@@ -143,7 +156,7 @@
command, arguments = userargs[0], userargs[1:]
# convert path values to canonical ones; copy other args as is
- args = [os.path.realpath(value) if os.path.isabs(arg) else value
+ args = [realpath(value) if os.path.isabs(arg) else value
for arg, value in zip(self.args, arguments)]
return super(PathFilter, self).get_command([command] + args,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.rootwrap-5.16.1/oslo_rootwrap/tests/test_functional.py
new/oslo.rootwrap-6.0.2/oslo_rootwrap/tests/test_functional.py
--- old/oslo.rootwrap-5.16.1/oslo_rootwrap/tests/test_functional.py
2019-09-04 16:25:31.000000000 +0200
+++ new/oslo.rootwrap-6.0.2/oslo_rootwrap/tests/test_functional.py
2020-04-07 12:06:58.000000000 +0200
@@ -23,6 +23,7 @@
import sys
import threading
import time
+from unittest import mock
try:
import eventlet
@@ -30,7 +31,6 @@
eventlet = None
import fixtures
-import mock
import six
import testtools
from testtools import content
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.rootwrap-5.16.1/oslo_rootwrap/tests/test_rootwrap.py
new/oslo.rootwrap-6.0.2/oslo_rootwrap/tests/test_rootwrap.py
--- old/oslo.rootwrap-5.16.1/oslo_rootwrap/tests/test_rootwrap.py
2019-09-04 16:25:31.000000000 +0200
+++ new/oslo.rootwrap-6.0.2/oslo_rootwrap/tests/test_rootwrap.py
2020-04-07 12:06:58.000000000 +0200
@@ -16,10 +16,10 @@
import logging.handlers
import os
import tempfile
+from unittest import mock
import uuid
import fixtures
-import mock
from six import moves
import testtools
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.rootwrap-5.16.1/releasenotes/notes/drop-python27-support-a4d3707304c73df6.yaml
new/oslo.rootwrap-6.0.2/releasenotes/notes/drop-python27-support-a4d3707304c73df6.yaml
---
old/oslo.rootwrap-5.16.1/releasenotes/notes/drop-python27-support-a4d3707304c73df6.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/oslo.rootwrap-6.0.2/releasenotes/notes/drop-python27-support-a4d3707304c73df6.yaml
2020-04-07 12:06:58.000000000 +0200
@@ -0,0 +1,5 @@
+---
+upgrade:
+ - |
+ Support for Python 2.7 has been dropped. The minimum version of Python now
+ supported is Python 3.6.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.rootwrap-5.16.1/releasenotes/notes/reap-rootwrap-daemon-process-60aebb56d8015484.yaml
new/oslo.rootwrap-6.0.2/releasenotes/notes/reap-rootwrap-daemon-process-60aebb56d8015484.yaml
---
old/oslo.rootwrap-5.16.1/releasenotes/notes/reap-rootwrap-daemon-process-60aebb56d8015484.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/oslo.rootwrap-6.0.2/releasenotes/notes/reap-rootwrap-daemon-process-60aebb56d8015484.yaml
2020-04-07 12:06:58.000000000 +0200
@@ -0,0 +1,11 @@
+---
+fixes:
+ - |
+ Reap the rootwrap daemon process after it is timeout and quit. When the
+ daemon process is timeout, it will kill itself. But the parent doesn't reap
+ it. Fixed this behaviour by adding a thread to wait the process to be done
+ once the daemon is started.
+
+ More info please refer the LP #1850241 [1].
+
+ [1] https://bugs.launchpad.net/oslo.rootwrap/+bug/1850241
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.16.1/releasenotes/source/conf.py
new/oslo.rootwrap-6.0.2/releasenotes/source/conf.py
--- old/oslo.rootwrap-5.16.1/releasenotes/source/conf.py 2019-09-04
16:25:31.000000000 +0200
+++ new/oslo.rootwrap-6.0.2/releasenotes/source/conf.py 2020-04-07
12:06:58.000000000 +0200
@@ -57,7 +57,6 @@
master_doc = 'index'
# General information about the project.
-project = u'oslo.rootwrap Release Notes'
copyright = u'2016, oslo.rootwrap Developers'
# Release notes do not need a version in the title, they span
@@ -146,10 +145,6 @@
# directly to the root of the documentation.
# html_extra_path = []
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
# html_use_smartypants = True
@@ -193,17 +188,6 @@
# -- Options for LaTeX output ---------------------------------------------
-latex_elements = {
- # The paper size ('letterpaper' or 'a4paper').
- # 'papersize': 'letterpaper',
-
- # The font size ('10pt', '11pt' or '12pt').
- # 'pointsize': '10pt',
-
- # Additional stuff for the LaTeX preamble.
- # 'preamble': '',
-}
-
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.16.1/releasenotes/source/index.rst
new/oslo.rootwrap-6.0.2/releasenotes/source/index.rst
--- old/oslo.rootwrap-5.16.1/releasenotes/source/index.rst 2019-09-04
16:25:31.000000000 +0200
+++ new/oslo.rootwrap-6.0.2/releasenotes/source/index.rst 2020-04-07
12:06:58.000000000 +0200
@@ -6,6 +6,7 @@
:maxdepth: 1
unreleased
+ train
stein
rocky
queens
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.16.1/releasenotes/source/train.rst
new/oslo.rootwrap-6.0.2/releasenotes/source/train.rst
--- old/oslo.rootwrap-5.16.1/releasenotes/source/train.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/oslo.rootwrap-6.0.2/releasenotes/source/train.rst 2020-04-07
12:06:58.000000000 +0200
@@ -0,0 +1,6 @@
+==========================
+Train Series Release Notes
+==========================
+
+.. release-notes::
+ :branch: stable/train
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.16.1/setup.cfg
new/oslo.rootwrap-6.0.2/setup.cfg
--- old/oslo.rootwrap-5.16.1/setup.cfg 2019-09-04 16:26:16.000000000 +0200
+++ new/oslo.rootwrap-6.0.2/setup.cfg 2020-04-07 12:08:05.000000000 +0200
@@ -6,6 +6,7 @@
description-file =
README.rst
home-page = https://docs.openstack.org/oslo.rootwrap/latest/
+python-requires = >=3.6
classifier =
Development Status :: 4 - Beta
Environment :: OpenStack
@@ -14,10 +15,11 @@
License :: OSI Approved :: Apache Software License
Operating System :: OS Independent
Programming Language :: Python
- Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
+ Programming Language :: Python :: 3 :: Only
+ Programming Language :: Python :: Implementation :: CPython
[files]
packages =
@@ -28,9 +30,6 @@
oslo-rootwrap = oslo_rootwrap.cmd:main
oslo-rootwrap-daemon = oslo_rootwrap.cmd:daemon
-[wheel]
-universal = 1
-
[egg_info]
tag_build =
tag_date = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.16.1/setup.py
new/oslo.rootwrap-6.0.2/setup.py
--- old/oslo.rootwrap-5.16.1/setup.py 2019-09-04 16:25:31.000000000 +0200
+++ new/oslo.rootwrap-6.0.2/setup.py 2020-04-07 12:06:58.000000000 +0200
@@ -13,17 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
- import multiprocessing # noqa
-except ImportError:
- pass
-
setuptools.setup(
setup_requires=['pbr>=2.0.0'],
pbr=True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.16.1/test-requirements.txt
new/oslo.rootwrap-6.0.2/test-requirements.txt
--- old/oslo.rootwrap-5.16.1/test-requirements.txt 2019-09-04
16:25:31.000000000 +0200
+++ new/oslo.rootwrap-6.0.2/test-requirements.txt 2020-04-07
12:06:58.000000000 +0200
@@ -9,14 +9,8 @@
stestr>=2.0.0 # Apache-2.0
# this is required for the docs build jobs
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
oslotest>=3.2.0 # Apache-2.0
-
-# mocking framework
-mock>=2.0.0 # BSD
-
# rootwrap daemon's client should be verified to run in eventlet
eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-5.16.1/tox.ini
new/oslo.rootwrap-6.0.2/tox.ini
--- old/oslo.rootwrap-5.16.1/tox.ini 2019-09-04 16:25:31.000000000 +0200
+++ new/oslo.rootwrap-6.0.2/tox.ini 2020-04-07 12:06:58.000000000 +0200
@@ -1,11 +1,12 @@
[tox]
-minversion = 2.0
-envlist = py27,py37,pep8
+minversion = 3.1
+envlist = py37,pep8
+ignore_basepython_conflict = true
[testenv]
-install_command = pip install {opts} {packages}
+basepython = python3
deps =
-
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
# Functional tests with Eventlet involve monkeypatching, so force them to be
@@ -15,12 +16,9 @@
stestr run --slowest (?!tests.test_functional_eventlet)tests {posargs}
env TEST_EVENTLET=1 stestr run --slowest tests.test_functional_eventlet
-[testenv:py27]
-basepython = python2.7
-
[testenv:pep8]
-basepython = python3
deps =
+
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt
commands =
flake8
@@ -28,7 +26,6 @@
bandit -r oslo_rootwrap tests -n5 --skip B404
[testenv:cover]
-basepython = python3
deps = {[testenv]deps}
coverage
setenv =
@@ -40,13 +37,16 @@
coverage xml -o cover/coverage.xml
[testenv:venv]
-basepython = python3
commands = {posargs}
[testenv:docs]
-basepython = python3
-deps = -r{toxinidir}/doc/requirements.txt
-commands = sphinx-build -W -b html doc/source doc/build/html
+whitelist_externals = rm
+deps =
+
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -r{toxinidir}/doc/requirements.txt
+commands =
+ rm -fr doc/build
+ sphinx-build -W --keep-going -b html doc/source doc/build/html
[flake8]
# E731 skipped as assign a lambda expression
@@ -60,16 +60,18 @@
commands = python benchmark/benchmark.py
[testenv:benchmark3]
-basepython = python3
commands = python3 benchmark/benchmark.py
[testenv:releasenotes]
-basepython = python3
-deps = -r{toxinidir}/doc/requirements.txt
-commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html
releasenotes/source releasenotes/build/html
+whitelist_externals = rm
+deps =
+
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -r{toxinidir}/doc/requirements.txt
+commands =
+ rm -rf releasenotes/build
+ sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html
releasenotes/source releasenotes/build/html
[testenv:lower-constraints]
-basepython = python3
deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt
