Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-oslo.rootwrap for
openSUSE:Factory checked in at 2021-12-12 00:57:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-oslo.rootwrap (Old)
and /work/SRC/openSUSE:Factory/.python-oslo.rootwrap.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.rootwrap"
Sun Dec 12 00:57:36 2021 rev:14 rq:939539 version:6.3.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-oslo.rootwrap/python-oslo.rootwrap.changes
2020-10-26 16:17:44.963004430 +0100
+++
/work/SRC/openSUSE:Factory/.python-oslo.rootwrap.new.2520/python-oslo.rootwrap.changes
2021-12-12 00:57:46.994591534 +0100
@@ -1,0 +2,22 @@
+Mon Dec 6 09:34:30 UTC 2021 - [email protected]
+
+- update to version 6.3.0
+ - Remove six
+ - Use TOX_CONSTRAINTS_FILE
+ - Update master for stable/victoria
+ - Remove six.PY3
+ - Remove lower-constraints remnants
+ - Dropping lower constraints testing
+ - Adding pre-commit
+ - setup.cfg: Replace dashes with underscores
+ - ignore reno generated artifacts
+ - Move flake8 as a pre-commit local target.
+ - Use py3 as the default runtime for tox
+ - Add Python3 wallaby unit tests
+
+-------------------------------------------------------------------
+Mon May 3 20:01:32 UTC 2021 - Dirk M??ller <[email protected]>
+
+- switch to wallaby template
+
+-------------------------------------------------------------------
Old:
----
oslo.rootwrap-6.2.0.tar.gz
New:
----
oslo.rootwrap-6.3.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-oslo.rootwrap.spec ++++++
--- /var/tmp/diff_new_pack.bs6GKd/_old 2021-12-12 00:57:47.498591880 +0100
+++ /var/tmp/diff_new_pack.bs6GKd/_new 2021-12-12 00:57:47.498591880 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-oslo.rootwrap
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,20 +17,20 @@
Name: python-oslo.rootwrap
-Version: 6.2.0
+Version: 6.3.0
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-6.2.0.tar.gz
+URL: https://docs.openstack.org/oslo.rootwrap
+Source0:
https://files.pythonhosted.org/packages/source/o/oslo.rootwrap/oslo.rootwrap-6.3.0.tar.gz
BuildRequires: openstack-macros
BuildRequires: python3-eventlet
BuildRequires: python3-fixtures
BuildRequires: python3-mock
BuildRequires: python3-oslotest
BuildRequires: python3-pbr
-BuildRequires: python3-six >= 1.10.0
+BuildRequires: python3-six
BuildRequires: python3-stestr
BuildRequires: python3-testtools
BuildArch: noarch
@@ -46,8 +46,7 @@
%package -n python3-oslo.rootwrap
Summary: Filtering shell commands to run as root from OpenStack services
-Group: Development/Languages/Python
-Requires: python3-six >= 1.10.0
+Requires: python3-six
%if 0%{?suse_version}
Obsoletes: python2-oslo.rootwrap < 6.0.1
%endif
@@ -60,7 +59,6 @@
%package -n python-oslo.rootwrap-doc
Summary: Documentation for OpenStack oslo.rootwrap
-Group: Development/Languages/Python
BuildRequires: python3-Sphinx
BuildRequires: python3-openstackdocstheme
@@ -68,14 +66,14 @@
Documentation for the OpenStack oslo.rootwrap library.
%prep
-%autosetup -p1 -n oslo.rootwrap-6.2.0
+%autosetup -p1 -n oslo.rootwrap-6.3.0
%py_req_cleanup
%build
%{py3_build}
# generate html docs
-PBR_VERSION=6.2.0 %sphinx_build -b html doc/source doc/build/html
+PBR_VERSION=6.3.0 %sphinx_build -b html doc/source doc/build/html
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
++++++ _service ++++++
--- /var/tmp/diff_new_pack.bs6GKd/_old 2021-12-12 00:57:47.526591900 +0100
+++ /var/tmp/diff_new_pack.bs6GKd/_new 2021-12-12 00:57:47.526591900 +0100
@@ -1,8 +1,8 @@
<services>
<service mode="disabled" name="renderspec">
- <param
name="input-template">https://opendev.org/openstack/rpm-packaging/raw/branch/stable/victoria/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2</param>
+ <param
name="input-template">https://opendev.org/openstack/rpm-packaging/raw/master/openstack/oslo.rootwrap/oslo.rootwrap.spec.j2</param>
<param name="output-name">python-oslo.rootwrap.spec</param>
- <param
name="requirements">https://opendev.org/openstack/oslo.rootwrap/raw/branch/stable/victoria/requirements.txt</param>
+ <param
name="requirements">https://opendev.org/openstack/oslo.rootwrap/raw/master/requirements.txt</param>
<param name="changelog-email">[email protected]</param>
<param name="changelog-provider">gh,openstack,oslo.rootwrap</param>
</service>
++++++ oslo.rootwrap-6.2.0.tar.gz -> oslo.rootwrap-6.3.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-6.2.0/.pre-commit-config.yaml
new/oslo.rootwrap-6.3.0/.pre-commit-config.yaml
--- old/oslo.rootwrap-6.2.0/.pre-commit-config.yaml 1970-01-01
01:00:00.000000000 +0100
+++ new/oslo.rootwrap-6.3.0/.pre-commit-config.yaml 2021-07-01
14:39:57.000000000 +0200
@@ -0,0 +1,39 @@
+# We from the Oslo project decided to pin repos based on the
+# commit hash instead of the version tag to prevend arbitrary
+# code from running in developer's machines. To update to a
+# newer version, run `pre-commit autoupdate` and then replace
+# the newer versions with their commit hash.
+
+default_language_version:
+ python: python3
+
+repos:
+ - repo: https://github.com/pre-commit/pre-commit-hooks
+ rev: 9136088a246768144165fcc3ecc3d31bb686920a # v3.3.0
+ hooks:
+ - id: trailing-whitespace
+ # Replaces or checks mixed line ending
+ - id: mixed-line-ending
+ args: ['--fix', 'lf']
+ exclude: '.*\.(svg)$'
+ # Forbid files which have a UTF-8 byte-order marker
+ - id: check-byte-order-marker
+ # Checks that non-binary executables have a proper shebang
+ - id: check-executables-have-shebangs
+ # Check for files that contain merge conflict strings.
+ - id: check-merge-conflict
+ # Check for debugger imports and py37+ breakpoint()
+ # calls in python source
+ - id: debug-statements
+ - id: check-yaml
+ files: .*\.(yaml|yml)$
+ - repo: local
+ hooks:
+ - id: flake8
+ name: flake8
+ additional_dependencies:
+ - hacking>=3.0.1,<3.1.0
+ language: python
+ entry: flake8
+ files: '^.*\.py$'
+ exclude: '^(doc|releasenotes|tools)/.*$'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-6.2.0/.zuul.yaml
new/oslo.rootwrap-6.3.0/.zuul.yaml
--- old/oslo.rootwrap-6.2.0/.zuul.yaml 2020-09-11 21:18:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/.zuul.yaml 2021-07-01 14:39:57.000000000 +0200
@@ -2,8 +2,7 @@
templates:
- check-requirements
- lib-forward-testing-python3
- - openstack-lower-constraints-jobs
- - openstack-python3-victoria-jobs
+ - openstack-python3-wallaby-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-6.2.0/AUTHORS
new/oslo.rootwrap-6.3.0/AUTHORS
--- old/oslo.rootwrap-6.2.0/AUTHORS 2020-09-11 21:19:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/AUTHORS 2021-07-01 14:40:27.000000000 +0200
@@ -11,6 +11,7 @@
Corey Bryant <[email protected]>
Cyril Roelandt <[email protected]>
Daniel Alvarez <[email protected]>
+Daniel Bengtsson <[email protected]>
Davanum Srinivas <[email protected]>
Davanum Srinivas <[email protected]>
Dina Belova <[email protected]>
@@ -60,6 +61,7 @@
Vu Cong Tuan <[email protected]>
XianChaobo <[email protected]>
Yatin Kumbhare <[email protected]>
+YuehuiLei <[email protected]>
Yufang Zhang <[email protected]>
Yuriy Taraday <[email protected]>
Zhao Lei <[email protected]>
@@ -73,5 +75,7 @@
pengyuesheng <[email protected]>
ricolin <[email protected]>
sonu.kumar <[email protected]>
+wangzihao <[email protected]>
+wu.shiming <[email protected]>
yan.haifeng <[email protected]>
zhangboye <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-6.2.0/ChangeLog
new/oslo.rootwrap-6.3.0/ChangeLog
--- old/oslo.rootwrap-6.2.0/ChangeLog 2020-09-11 21:19:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/ChangeLog 2021-07-01 14:40:27.000000000 +0200
@@ -1,6 +1,22 @@
CHANGES
=======
+6.3.0
+-----
+
+* setup.cfg: Replace dashes with underscores
+* Move flake8 as a pre-commit local target
+* Remove lower-constraints remnants
+* Dropping lower constraints testing
+* Use TOX\_CONSTRAINTS\_FILE
+* Use py3 as the default runtime for tox
+* Remove six
+* Remove six.PY3
+* Add Python3 wallaby unit tests
+* Update master for stable/victoria
+* Adding pre-commit
+* ignore reno generated artifacts
+
6.2.0
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-6.2.0/PKG-INFO
new/oslo.rootwrap-6.3.0/PKG-INFO
--- old/oslo.rootwrap-6.2.0/PKG-INFO 2020-09-11 21:19:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/PKG-INFO 2021-07-01 14:40:27.751943800 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: oslo.rootwrap
-Version: 6.2.0
+Version: 6.3.0
Summary: Oslo Rootwrap
Home-page: https://docs.openstack.org/oslo.rootwrap/latest/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-6.2.0/benchmark/benchmark.py
new/oslo.rootwrap-6.3.0/benchmark/benchmark.py
--- old/oslo.rootwrap-6.2.0/benchmark/benchmark.py 2020-09-11
21:18:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/benchmark/benchmark.py 2021-07-01
14:39:57.000000000 +0200
@@ -16,7 +16,6 @@
import atexit
import math
import os
-import six
import subprocess
import sys
import timeit
@@ -33,9 +32,8 @@
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
out, err = obj.communicate()
- if six.PY3:
- out = os.fsdecode(out)
- err = os.fsdecode(err)
+ out = os.fsdecode(out)
+ err = os.fsdecode(err)
return obj.returncode, out, err
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-6.2.0/doc/source/conf.py
new/oslo.rootwrap-6.3.0/doc/source/conf.py
--- old/oslo.rootwrap-6.2.0/doc/source/conf.py 2020-09-11 21:18:24.000000000
+0200
+++ new/oslo.rootwrap-6.3.0/doc/source/conf.py 2021-07-01 14:39:57.000000000
+0200
@@ -1,4 +1,6 @@
# -*- coding: utf-8 -*-
+# Copyright (C) 2020 Red Hat, Inc.
+#
# 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
@@ -22,7 +24,6 @@
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = [
'sphinx.ext.autodoc',
- #'sphinx.ext.intersphinx',
'openstackdocstheme',
]
@@ -76,6 +77,3 @@
u'%s Documentation' % project,
u'OpenStack Foundation', 'manual'),
]
-
-# Example configuration for intersphinx: refer to the Python standard library.
-#intersphinx_mapping = {'http://docs.python.org/': None}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-6.2.0/lower-constraints.txt
new/oslo.rootwrap-6.3.0/lower-constraints.txt
--- old/oslo.rootwrap-6.2.0/lower-constraints.txt 2020-09-11
21:18:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/lower-constraints.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-alabaster==0.7.10
-appdirs==1.3.0
-Babel==2.3.4
-bandit==1.1.0
-docutils==0.11
-dulwich==0.15.0
-eventlet==0.18.2
-extras==1.0.0
-fixtures==3.0.0
-gitdb==0.6.4
-GitPython==1.0.1
-greenlet==0.4.15
-imagesize==0.7.1
-iso8601==0.1.11
-Jinja2==2.10
-keystoneauth1==3.4.0
-linecache2==1.0.0
-MarkupSafe==1.0
-mox3==0.20.0
-os-client-config==1.28.0
-oslotest==3.2.0
-pbr==2.0.0
-Pygments==2.2.0
-python-mimeparse==1.6.0
-python-subunit==1.0.0
-pytz==2013.6
-PyYAML==3.13
-reno==3.1.0
-requests==2.14.2
-requestsexceptions==1.2.0
-six==1.10.0
-smmap==0.9.0
-snowballstemmer==1.2.1
-stestr==2.0.0
-stevedore==1.20.0
-testtools==2.2.0
-traceback2==1.4.0
-unittest2==1.1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-6.2.0/oslo.rootwrap.egg-info/PKG-INFO
new/oslo.rootwrap-6.3.0/oslo.rootwrap.egg-info/PKG-INFO
--- old/oslo.rootwrap-6.2.0/oslo.rootwrap.egg-info/PKG-INFO 2020-09-11
21:19:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/oslo.rootwrap.egg-info/PKG-INFO 2021-07-01
14:40:27.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: oslo.rootwrap
-Version: 6.2.0
+Version: 6.3.0
Summary: Oslo Rootwrap
Home-page: https://docs.openstack.org/oslo.rootwrap/latest/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.rootwrap-6.2.0/oslo.rootwrap.egg-info/SOURCES.txt
new/oslo.rootwrap-6.3.0/oslo.rootwrap.egg-info/SOURCES.txt
--- old/oslo.rootwrap-6.2.0/oslo.rootwrap.egg-info/SOURCES.txt 2020-09-11
21:19:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/oslo.rootwrap.egg-info/SOURCES.txt 2021-07-01
14:40:27.000000000 +0200
@@ -1,3 +1,4 @@
+.pre-commit-config.yaml
.stestr.conf
.zuul.yaml
AUTHORS
@@ -5,7 +6,6 @@
ChangeLog
LICENSE
README.rst
-lower-constraints.txt
requirements.txt
setup.cfg
setup.py
@@ -29,7 +29,6 @@
oslo.rootwrap.egg-info/entry_points.txt
oslo.rootwrap.egg-info/not-zip-safe
oslo.rootwrap.egg-info/pbr.json
-oslo.rootwrap.egg-info/requires.txt
oslo.rootwrap.egg-info/top_level.txt
oslo_rootwrap/__init__.py
oslo_rootwrap/client.py
@@ -58,5 +57,6 @@
releasenotes/source/train.rst
releasenotes/source/unreleased.rst
releasenotes/source/ussuri.rst
+releasenotes/source/victoria.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-6.2.0/oslo.rootwrap.egg-info/pbr.json
new/oslo.rootwrap-6.3.0/oslo.rootwrap.egg-info/pbr.json
--- old/oslo.rootwrap-6.2.0/oslo.rootwrap.egg-info/pbr.json 2020-09-11
21:19:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/oslo.rootwrap.egg-info/pbr.json 2021-07-01
14:40:27.000000000 +0200
@@ -1 +1 @@
-{"git_version": "ed1659a", "is_release": true}
\ No newline at end of file
+{"git_version": "25fcff9", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.rootwrap-6.2.0/oslo.rootwrap.egg-info/requires.txt
new/oslo.rootwrap-6.3.0/oslo.rootwrap.egg-info/requires.txt
--- old/oslo.rootwrap-6.2.0/oslo.rootwrap.egg-info/requires.txt 2020-09-11
21:19:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/oslo.rootwrap.egg-info/requires.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-six>=1.10.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-6.2.0/oslo_rootwrap/cmd.py
new/oslo.rootwrap-6.3.0/oslo_rootwrap/cmd.py
--- old/oslo.rootwrap-6.2.0/oslo_rootwrap/cmd.py 2020-09-11
21:18:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/oslo_rootwrap/cmd.py 2021-07-01
14:39:57.000000000 +0200
@@ -29,7 +29,7 @@
Service packaging should deploy .filters files only on nodes where
they are needed, to avoid allowing more than is necessary.
"""
-
+import configparser
import logging
import os
import sys
@@ -37,8 +37,6 @@
from oslo_rootwrap import subprocess
from oslo_rootwrap import wrapper
-from six import moves
-
try:
# This isn't available on all platforms (e.g. Windows).
import resource
@@ -79,13 +77,13 @@
# Load configuration
try:
- rawconfig = moves.configparser.RawConfigParser()
+ rawconfig = configparser.RawConfigParser()
rawconfig.read(configfile)
config = wrapper.RootwrapConfig(rawconfig)
except ValueError as exc:
msg = "Incorrect value in %s: %s" % (configfile, exc.args[0])
_exit_error(execname, msg, RC_BADCONFIG, log=False)
- except moves.configparser.Error:
+ except configparser.Error:
_exit_error(execname, "Incorrect configuration file: %s" % configfile,
RC_BADCONFIG, log=False)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-6.2.0/oslo_rootwrap/daemon.py
new/oslo.rootwrap-6.3.0/oslo_rootwrap/daemon.py
--- old/oslo.rootwrap-6.2.0/oslo_rootwrap/daemon.py 2020-09-11
21:18:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/oslo_rootwrap/daemon.py 2021-07-01
14:39:57.000000000 +0200
@@ -19,7 +19,6 @@
import os
import shutil
import signal
-import six
import stat
import sys
import tempfile
@@ -67,12 +66,11 @@
' '.join(userargs))
return cmd.RC_UNAUTHORIZED, "", ""
- if six.PY3 and stdin is not None:
+ if stdin is not None:
stdin = os.fsencode(stdin)
out, err = obj.communicate(stdin)
- if six.PY3:
- out = os.fsdecode(out)
- err = os.fsdecode(err)
+ out = os.fsdecode(out)
+ err = os.fsdecode(err)
return obj.returncode, out, err
@classmethod
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.rootwrap-6.2.0/oslo_rootwrap/tests/test_functional.py
new/oslo.rootwrap-6.3.0/oslo_rootwrap/tests/test_functional.py
--- old/oslo.rootwrap-6.2.0/oslo_rootwrap/tests/test_functional.py
2020-09-11 21:18:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/oslo_rootwrap/tests/test_functional.py
2021-07-01 14:39:57.000000000 +0200
@@ -31,10 +31,10 @@
eventlet = None
import fixtures
-import six
import testtools
from testtools import content
+
from oslo_rootwrap import client
from oslo_rootwrap import cmd
from oslo_rootwrap import subprocess
@@ -159,7 +159,7 @@
self.addCleanup(p.stop)
# Collect client logs
- client_log = six.StringIO()
+ client_log = io.StringIO()
handler = logging.StreamHandler(client_log)
log_format = run_daemon.log_format.replace('+', ' ')
handler.setFormatter(logging.Formatter(log_format))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.rootwrap-6.2.0/oslo_rootwrap/tests/test_rootwrap.py
new/oslo.rootwrap-6.3.0/oslo_rootwrap/tests/test_rootwrap.py
--- old/oslo.rootwrap-6.2.0/oslo_rootwrap/tests/test_rootwrap.py
2020-09-11 21:18:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/oslo_rootwrap/tests/test_rootwrap.py
2021-07-01 14:39:57.000000000 +0200
@@ -12,6 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
+import configparser
import logging
import logging.handlers
import os
@@ -20,7 +21,6 @@
import uuid
import fixtures
-from six import moves
import testtools
from oslo_rootwrap import cmd
@@ -299,7 +299,7 @@
mock_readlink.return_value = command + ';90bfb2 (deleted)'
m = mock.mock_open(read_data=command)
- with mock.patch("six.moves.builtins.open", m, create=True):
+ with mock.patch("builtins.open", m, create=True):
mock_isfile.side_effect = fake_os_func
mock_exists.side_effect = fake_os_func
mock_access.side_effect = fake_os_func
@@ -454,10 +454,10 @@
self.assertTrue(filtermatch is self.filters[-1])
def test_RootwrapConfig(self):
- raw = moves.configparser.RawConfigParser()
+ raw = configparser.RawConfigParser()
# Empty config should raise configparser.Error
- self.assertRaises(moves.configparser.Error,
+ self.assertRaises(configparser.Error,
wrapper.RootwrapConfig, raw)
# Check default values
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-6.2.0/oslo_rootwrap/wrapper.py
new/oslo.rootwrap-6.3.0/oslo_rootwrap/wrapper.py
--- old/oslo.rootwrap-6.2.0/oslo_rootwrap/wrapper.py 2020-09-11
21:18:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/oslo_rootwrap/wrapper.py 2021-07-01
14:39:57.000000000 +0200
@@ -13,15 +13,13 @@
# License for the specific language governing permissions and limitations
# under the License.
+import configparser
import logging
import logging.handlers
import os
import signal
import sys
-import six
-from six import moves
-
from oslo_rootwrap import filters
from oslo_rootwrap import subprocess
@@ -142,8 +140,8 @@
filterfilepath = os.path.join(filterdir, filterfile)
if not os.path.isfile(filterfilepath):
continue
- kwargs = {"strict": False} if six.PY3 else {}
- filterconfig = moves.configparser.RawConfigParser(**kwargs)
+ kwargs = {"strict": False}
+ filterconfig = configparser.RawConfigParser(**kwargs)
filterconfig.read(filterfilepath)
for (name, value) in filterconfig.items("Filters"):
filterdefinition = [s.strip() for s in value.split(',')]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-6.2.0/releasenotes/source/conf.py
new/oslo.rootwrap-6.3.0/releasenotes/source/conf.py
--- old/oslo.rootwrap-6.2.0/releasenotes/source/conf.py 2020-09-11
21:18:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/releasenotes/source/conf.py 2021-07-01
14:39:57.000000000 +0200
@@ -1,4 +1,6 @@
# -*- coding: utf-8 -*-
+# Copyright (C) 2020 Red Hat, Inc.
+#
# 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-6.2.0/releasenotes/source/index.rst
new/oslo.rootwrap-6.3.0/releasenotes/source/index.rst
--- old/oslo.rootwrap-6.2.0/releasenotes/source/index.rst 2020-09-11
21:18:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/releasenotes/source/index.rst 2021-07-01
14:39:57.000000000 +0200
@@ -6,6 +6,7 @@
:maxdepth: 1
unreleased
+ victoria
ussuri
train
stein
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-6.2.0/releasenotes/source/victoria.rst
new/oslo.rootwrap-6.3.0/releasenotes/source/victoria.rst
--- old/oslo.rootwrap-6.2.0/releasenotes/source/victoria.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/oslo.rootwrap-6.3.0/releasenotes/source/victoria.rst 2021-07-01
14:39:57.000000000 +0200
@@ -0,0 +1,6 @@
+=============================
+Victoria Series Release Notes
+=============================
+
+.. release-notes::
+ :branch: stable/victoria
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-6.2.0/requirements.txt
new/oslo.rootwrap-6.3.0/requirements.txt
--- old/oslo.rootwrap-6.2.0/requirements.txt 2020-09-11 21:18:24.000000000
+0200
+++ new/oslo.rootwrap-6.3.0/requirements.txt 2021-07-01 14:39:57.000000000
+0200
@@ -2,4 +2,3 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-six>=1.10.0 # MIT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-6.2.0/setup.cfg
new/oslo.rootwrap-6.3.0/setup.cfg
--- old/oslo.rootwrap-6.2.0/setup.cfg 2020-09-11 21:19:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/setup.cfg 2021-07-01 14:40:27.751943800 +0200
@@ -1,12 +1,12 @@
[metadata]
name = oslo.rootwrap
author = OpenStack
-author-email = [email protected]
+author_email = [email protected]
summary = Oslo Rootwrap
-description-file =
+description_file =
README.rst
-home-page = https://docs.openstack.org/oslo.rootwrap/latest/
-python-requires = >=3.6
+home_page = https://docs.openstack.org/oslo.rootwrap/latest/
+python_requires = >=3.6
classifier =
Development Status :: 4 - Beta
Environment :: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-6.2.0/test-requirements.txt
new/oslo.rootwrap-6.3.0/test-requirements.txt
--- old/oslo.rootwrap-6.2.0/test-requirements.txt 2020-09-11
21:18:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/test-requirements.txt 2021-07-01
14:39:57.000000000 +0200
@@ -18,3 +18,5 @@
# Bandit security code scanner
bandit>=1.6.0,<1.7.0 # Apache-2.0
+
+pre-commit>=2.6.0 # MIT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.rootwrap-6.2.0/tox.ini
new/oslo.rootwrap-6.3.0/tox.ini
--- old/oslo.rootwrap-6.2.0/tox.ini 2020-09-11 21:18:24.000000000 +0200
+++ new/oslo.rootwrap-6.3.0/tox.ini 2021-07-01 14:39:57.000000000 +0200
@@ -1,12 +1,12 @@
[tox]
minversion = 3.1
-envlist = py38,pep8
+envlist = py3,pep8
ignore_basepython_conflict = true
[testenv]
basepython = python3
deps =
-
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+
-c{env:TOX_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
@@ -18,10 +18,10 @@
[testenv:pep8]
deps =
-
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt
commands =
- flake8
+ pre-commit run -a
# Run security linter
bandit -r oslo_rootwrap tests -n5 --skip B404
@@ -42,7 +42,7 @@
[testenv:docs]
whitelist_externals = rm
deps =
-
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt
commands =
rm -fr doc/build
@@ -65,14 +65,9 @@
[testenv:releasenotes]
whitelist_externals = rm
deps =
-
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+
-c{env:TOX_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]
-deps =
- -c{toxinidir}/lower-constraints.txt
- -r{toxinidir}/test-requirements.txt
- -r{toxinidir}/requirements.txt
