diff -Nru python-oslo.log-3.39.0/ChangeLog python-oslo.log-3.40.1/ChangeLog --- python-oslo.log-3.39.0/ChangeLog 2018-06-27 08:29:41.000000000 +0000 +++ python-oslo.log-3.40.1/ChangeLog 2018-09-25 19:52:18.000000000 +0000 @@ -1,6 +1,20 @@ CHANGES ======= +3.40.1 +------ + +* Filter args dict in JSONFormatter +* add lib-forward-testing-python3 test job +* add python 3.6 unit test job +* rewrite tests to not rely on implementation details of logging module +* import zuul job settings from project-config +* Follow the new PTI for document build +* Migrate to stestr +* Fix lower-constraints job +* Imported Translations from Zanata +* Update reno for stable/rocky + 3.39.0 ------ diff -Nru python-oslo.log-3.39.0/debian/changelog python-oslo.log-3.40.1/debian/changelog --- python-oslo.log-3.39.0/debian/changelog 2018-07-25 19:32:15.000000000 +0000 +++ python-oslo.log-3.40.1/debian/changelog 2018-11-14 15:20:19.000000000 +0000 @@ -1,3 +1,12 @@ +python-oslo.log (3.40.1-0ubuntu1) disco; urgency=medium + + * New upstream release for OpenStack Stein. + * d/control: Align (Build-)Depends with upstream. + * d/p/temporarily-remove-failing-py3.6-tests.patch: Drop, included + upstream. + + -- James Page Wed, 14 Nov 2018 15:20:19 +0000 + python-oslo.log (3.39.0-0ubuntu1) cosmic; urgency=medium * New upstream release for OpenStack Rocky. diff -Nru python-oslo.log-3.39.0/debian/control python-oslo.log-3.40.1/debian/control --- python-oslo.log-3.39.0/debian/control 2018-07-25 19:32:15.000000000 +0000 +++ python-oslo.log-3.40.1/debian/control 2018-11-14 15:20:19.000000000 +0000 @@ -10,45 +10,45 @@ dh-python, openstack-pkg-tools, python-all, - python-pbr (>= 2.0.0), + python-pbr (>= 3.1.1), python-setuptools, python-sphinx (>= 1.6.2), python3-all, - python3-pbr (>= 2.0.0), + python3-pbr (>= 3.1.1), python3-setuptools, Build-Depends-Indep: bandit, python-coverage (>= 4.0), - python-dateutil (>= 2.5.3), - python-debtcollector (>= 1.2.0), + python-dateutil (>= 2.7.0), + python-debtcollector (>= 1.19.0), python-fixtures, python-funcsigs, python-hacking (>= 0.12.0), python-mock (>= 2.0.0), - python-monotonic (>= 0.6), + python-monotonic (>= 1.4), python-openstackdocstheme (>= 1.18.1), python-oslo.config (>= 1:5.2.0), - python-oslo.context (>= 1:2.19.2), + python-oslo.context (>= 1:2.20.0), python-oslo.i18n (>= 3.15.3), - python-oslo.serialization (>= 2.18.0), - python-oslo.utils (>= 3.33.0), + python-oslo.serialization (>= 2.25.0), + python-oslo.utils (>= 3.36.0), python-oslotest (>= 1:3.2.0), python-pyinotify (>= 0.9.6), - python-six (>= 1.10.0), + python-six (>= 1.11.0), python-testtools (>= 2.2.0), - python3-dateutil (>= 2.5.3), - python3-debtcollector (>= 1.2.0), + python3-dateutil (>= 2.7.0), + python3-debtcollector (>= 1.19.0), python3-fixtures, python3-funcsigs, python3-mock (>= 2.0.0), python3-oslo.config (>= 1:5.2.0), - python3-oslo.context (>= 1:2.19.2), + python3-oslo.context (>= 1:2.20.0), python3-oslo.i18n (>= 3.15.3), - python3-oslo.serialization (>= 2.18.0), - python3-oslo.utils (>= 3.33.0), + python3-oslo.serialization (>= 2.25.0), + python3-oslo.utils (>= 3.36.0), python3-oslotest (>= 1:3.2.0), python3-pyinotify (>= 0.9.6), - python3-six (>= 1.10.0), + python3-six (>= 1.11.0), python3-subunit, python3-testtools (>= 2.2.0), subunit, @@ -61,17 +61,17 @@ Package: python-oslo.log Architecture: all Depends: - python-dateutil (>= 2.5.3), - python-debtcollector (>= 1.2.0), - python-monotonic (>= 0.6), + python-dateutil (>= 2.7.0), + python-debtcollector (>= 1.19.0), + python-monotonic (>= 1.4), python-oslo.config (>= 1:5.2.0), - python-oslo.context (>= 1:2.19.2), + python-oslo.context (>= 1:2.20.0), python-oslo.i18n (>= 3.15.3), - python-oslo.serialization (>= 2.18.0), - python-oslo.utils (>= 3.33.0), - python-pbr (>= 2.0.0), + python-oslo.serialization (>= 2.25.0), + python-oslo.utils (>= 3.36.0), + python-pbr (>= 3.1.1), python-pyinotify (>= 0.9.6), - python-six (>= 1.10.0), + python-six (>= 1.11.0), ${misc:Depends}, ${python:Depends}, Suggests: @@ -99,17 +99,17 @@ Package: python3-oslo.log Architecture: all Depends: - python3-dateutil (>= 2.5.3), - python3-debtcollector (>= 1.2.0), - python3-monotonic (>= 0.6), + python3-dateutil (>= 2.7.0), + python3-debtcollector (>= 1.19.0), + python3-monotonic (>= 1.4), python3-oslo.config (>= 1:5.2.0), - python3-oslo.context (>= 1:2.19.2), + python3-oslo.context (>= 1:2.20.0), python3-oslo.i18n (>= 3.15.3), - python3-oslo.serialization (>= 2.18.0), - python3-oslo.utils (>= 3.33.0), - python3-pbr (>= 2.0.0), + python3-oslo.serialization (>= 2.25.0), + python3-oslo.utils (>= 3.36.0), + python3-pbr (>= 3.1.1), python3-pyinotify (>= 0.9.6), - python3-six (>= 1.10.0), + python3-six (>= 1.11.0), ${misc:Depends}, ${python3:Depends}, Suggests: diff -Nru python-oslo.log-3.39.0/debian/patches/series python-oslo.log-3.40.1/debian/patches/series --- python-oslo.log-3.39.0/debian/patches/series 2018-07-25 19:32:15.000000000 +0000 +++ python-oslo.log-3.40.1/debian/patches/series 2018-11-14 15:20:19.000000000 +0000 @@ -1,2 +1 @@ skip-py3.7-test.patch -temporarily-remove-failing-py3.6-tests.patch diff -Nru python-oslo.log-3.39.0/debian/patches/temporarily-remove-failing-py3.6-tests.patch python-oslo.log-3.40.1/debian/patches/temporarily-remove-failing-py3.6-tests.patch --- python-oslo.log-3.39.0/debian/patches/temporarily-remove-failing-py3.6-tests.patch 2018-07-25 19:32:15.000000000 +0000 +++ python-oslo.log-3.40.1/debian/patches/temporarily-remove-failing-py3.6-tests.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -Description: Temporarily drop failing Python 3.6 tests - See LP bug referenced below. -Author: Thomas Goirand -Bug-Debian: https://bugs.debian.org/884052 -Bug-Ubuntu: https://launchpad.net/bugs/1737493 -Forwarded: -Reviewed-By: -Last-Update: 2018-01-24 - ---- python-oslo.log-3.30.2.orig/oslo_log/tests/unit/test_log.py -+++ python-oslo.log-3.30.2/oslo_log/tests/unit/test_log.py -@@ -1690,54 +1690,6 @@ class KeywordArgumentAdapterTestCase(Bas - 'resource_uuid': expected['resource_uuid']}}, - kwargs) - -- def test_pass_args_to_log(self): -- a = log.KeywordArgumentAdapter(self.mock_log, {}) -- message = 'message' -- exc_message = 'exception' -- key = 'name' -- val = 'value' -- a.log(logging.DEBUG, message, name=val, exc_info=exc_message) -- if six.PY3: -- self.mock_log._log.assert_called_once_with( -- logging.DEBUG, -- message, -- (), -- extra={key: val, 'extra_keys': [key]}, -- exc_info=exc_message -- ) -- else: -- self.mock_log.log.assert_called_once_with( -- logging.DEBUG, -- message, -- extra={key: val, 'extra_keys': [key]}, -- exc_info=exc_message -- ) -- -- def test_pass_args_via_debug(self): -- a = log.KeywordArgumentAdapter(self.mock_log, {}) -- message = 'message' -- exc_message = 'exception' -- key = 'name' -- val = 'value' -- a.debug(message, name=val, exc_info=exc_message) -- # The adapter implementation for debug() is different for -- # python 3, so we expect a different method to be called -- # internally. -- if six.PY3: -- self.mock_log._log.assert_called_once_with( -- logging.DEBUG, -- message, -- (), -- extra={key: val, 'extra_keys': [key]}, -- exc_info=exc_message -- ) -- else: -- self.mock_log.debug.assert_called_once_with( -- message, -- extra={key: val, 'extra_keys': [key]}, -- exc_info=exc_message -- ) -- - - class UnicodeConversionTestCase(BaseTestCase): - diff -Nru python-oslo.log-3.39.0/doc/requirements.txt python-oslo.log-3.40.1/doc/requirements.txt --- python-oslo.log-3.39.0/doc/requirements.txt 1970-01-01 00:00:00.000000000 +0000 +++ python-oslo.log-3.40.1/doc/requirements.txt 2018-09-25 19:49:15.000000000 +0000 @@ -0,0 +1,7 @@ +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. + +sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +openstackdocstheme>=1.18.1 # Apache-2.0 +reno>=2.5.0 # Apache-2.0 diff -Nru python-oslo.log-3.39.0/lower-constraints.txt python-oslo.log-3.40.1/lower-constraints.txt --- python-oslo.log-3.39.0/lower-constraints.txt 2018-06-27 08:26:18.000000000 +0000 +++ python-oslo.log-3.40.1/lower-constraints.txt 2018-09-25 19:49:15.000000000 +0000 @@ -59,7 +59,9 @@ snowballstemmer==1.2.1 Sphinx==1.6.5 sphinxcontrib-websupport==1.0.1 +stestr==2.0.0 stevedore==1.28.0 +systemd-python==234 testrepository==0.0.20 testtools==2.3.0 traceback2==1.4.0 diff -Nru python-oslo.log-3.39.0/oslo_log/formatters.py python-oslo.log-3.40.1/oslo_log/formatters.py --- python-oslo.log-3.39.0/oslo_log/formatters.py 2018-06-27 08:26:18.000000000 +0000 +++ python-oslo.log-3.40.1/oslo_log/formatters.py 2018-09-25 19:49:15.000000000 +0000 @@ -17,6 +17,7 @@ import logging import logging.config import logging.handlers +import re import socket import sys import traceback @@ -180,6 +181,9 @@ return dict.get(self, key, None) or '-' +_MSG_KEY_REGEX = re.compile('(%+)\((\w+)\)') + + class JSONFormatter(logging.Formatter): def __init__(self, fmt=None, datefmt=None, style='%'): # NOTE(sfinucan) we ignore the fmt and style arguments, but they're @@ -206,11 +210,22 @@ return lines def format(self, record): + args = record.args + if isinstance(args, dict): + msg_keys = _MSG_KEY_REGEX.findall(record.msg) + # NOTE(bnemec): The logic around skipping escaped placeholders is + # tricky and error-prone to include in the regex. Much easier to + # just grab them all and filter after the fact. + msg_keys = [m[1] for m in msg_keys if len(m[0]) == 1] + # If no named keys were found, then the entire dict must have been + # the value to be formatted. Don't filter anything. + if msg_keys: + args = {k: v for k, v in args.items() if k in msg_keys} message = {'message': record.getMessage(), 'asctime': self.formatTime(record, self.datefmt), 'name': record.name, 'msg': record.msg, - 'args': record.args, + 'args': args, 'levelname': record.levelname, 'levelno': record.levelno, 'pathname': record.pathname, diff -Nru python-oslo.log-3.39.0/oslo_log/tests/unit/test_log.py python-oslo.log-3.40.1/oslo_log/tests/unit/test_log.py --- python-oslo.log-3.39.0/oslo_log/tests/unit/test_log.py 2018-06-27 08:26:18.000000000 +0000 +++ python-oslo.log-3.40.1/oslo_log/tests/unit/test_log.py 2018-09-25 19:49:15.000000000 +0000 @@ -591,6 +591,22 @@ # convert it using repr() to prevent serialization error on logging. self.assertEqual(['repr'], data['args']) + def test_extra_args_filtered(self): + test_msg = 'This is a %(test)s line %%(unused)' + test_data = {'test': 'log', 'unused': 'removeme'} + self.log.debug(test_msg, test_data) + + data = jsonutils.loads(self.stream.getvalue()) + self.assertNotIn('unused', data['args']) + + def test_entire_dict(self): + test_msg = 'This is a %s dict' + test_data = {'test': 'log', 'other': 'value'} + self.log.debug(test_msg, test_data) + + data = jsonutils.loads(self.stream.getvalue()) + self.assertEqual(test_data, data['args']) + def get_fake_datetime(retval): class FakeDateTime(datetime.datetime): @@ -1702,6 +1718,20 @@ disable_existing_loggers=False) +class SavingAdapter(log.KeywordArgumentAdapter): + + def __init__(self, *args, **kwds): + super(log.KeywordArgumentAdapter, self).__init__(*args, **kwds) + self.results = [] + + def process(self, msg, kwargs): + # Run the real adapter and save the inputs and outputs + # before returning them so the test can examine both. + results = super(SavingAdapter, self).process(msg, kwargs) + self.results.append((msg, kwargs, results)) + return results + + class KeywordArgumentAdapterTestCase(BaseTestCase): def setUp(self): @@ -1754,52 +1784,44 @@ kwargs) def test_pass_args_to_log(self): - a = log.KeywordArgumentAdapter(self.mock_log, {}) + a = SavingAdapter(self.mock_log, {}) + message = 'message' exc_message = 'exception' - key = 'name' val = 'value' a.log(logging.DEBUG, message, name=val, exc_info=exc_message) - if six.PY3: - self.mock_log._log.assert_called_once_with( - logging.DEBUG, - message, - (), - extra={key: val, 'extra_keys': [key]}, - exc_info=exc_message - ) - else: - self.mock_log.log.assert_called_once_with( - logging.DEBUG, - message, - extra={key: val, 'extra_keys': [key]}, - exc_info=exc_message - ) + + expected = { + 'exc_info': exc_message, + 'extra': {'name': val, 'extra_keys': ['name']}, + } + + actual = a.results[0] + self.assertEqual(message, actual[0]) + self.assertEqual(expected, actual[1]) + results = actual[2] + self.assertEqual(message, results[0]) + self.assertEqual(expected, results[1]) def test_pass_args_via_debug(self): - a = log.KeywordArgumentAdapter(self.mock_log, {}) + + a = SavingAdapter(self.mock_log, {}) message = 'message' exc_message = 'exception' - key = 'name' val = 'value' a.debug(message, name=val, exc_info=exc_message) - # The adapter implementation for debug() is different for - # python 3, so we expect a different method to be called - # internally. - if six.PY3: - self.mock_log._log.assert_called_once_with( - logging.DEBUG, - message, - (), - extra={key: val, 'extra_keys': [key]}, - exc_info=exc_message - ) - else: - self.mock_log.debug.assert_called_once_with( - message, - extra={key: val, 'extra_keys': [key]}, - exc_info=exc_message - ) + + expected = { + 'exc_info': exc_message, + 'extra': {'name': val, 'extra_keys': ['name']}, + } + + actual = a.results[0] + self.assertEqual(message, actual[0]) + self.assertEqual(expected, actual[1]) + results = actual[2] + self.assertEqual(message, results[0]) + self.assertEqual(expected, results[1]) class UnicodeConversionTestCase(BaseTestCase): diff -Nru python-oslo.log-3.39.0/oslo.log.egg-info/pbr.json python-oslo.log-3.40.1/oslo.log.egg-info/pbr.json --- python-oslo.log-3.39.0/oslo.log.egg-info/pbr.json 2018-06-27 08:29:41.000000000 +0000 +++ python-oslo.log-3.40.1/oslo.log.egg-info/pbr.json 2018-09-25 19:52:18.000000000 +0000 @@ -1 +1 @@ -{"git_version": "3b43002", "is_release": true} \ No newline at end of file +{"git_version": "a93c6ef", "is_release": true} \ No newline at end of file diff -Nru python-oslo.log-3.39.0/oslo.log.egg-info/PKG-INFO python-oslo.log-3.40.1/oslo.log.egg-info/PKG-INFO --- python-oslo.log-3.39.0/oslo.log.egg-info/PKG-INFO 2018-06-27 08:29:41.000000000 +0000 +++ python-oslo.log-3.40.1/oslo.log.egg-info/PKG-INFO 2018-09-25 19:52:18.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: oslo.log -Version: 3.39.0 +Version: 3.40.1 Summary: oslo.log library Home-page: https://docs.openstack.org/oslo.log/latest Author: OpenStack diff -Nru python-oslo.log-3.39.0/oslo.log.egg-info/requires.txt python-oslo.log-3.40.1/oslo.log.egg-info/requires.txt --- python-oslo.log-3.39.0/oslo.log.egg-info/requires.txt 2018-06-27 08:29:41.000000000 +0000 +++ python-oslo.log-3.40.1/oslo.log.egg-info/requires.txt 2018-09-25 19:52:18.000000000 +0000 @@ -1,14 +1,14 @@ -pbr!=2.1.0,>=2.0.0 -six>=1.10.0 +pbr>=3.1.1 +six>=1.11.0 oslo.config>=5.2.0 -oslo.context>=2.19.2 -oslo.i18n>=3.15.3 -oslo.utils>=3.33.0 -oslo.serialization!=2.19.1,>=2.18.0 -debtcollector>=1.2.0 +oslo.context>=2.20.0 +oslo.i18n>=3.20.0 +oslo.utils>=3.36.0 +oslo.serialization>=2.25.0 +debtcollector>=1.19.0 pyinotify>=0.9.6 -python-dateutil>=2.5.3 -monotonic>=0.6 +python-dateutil>=2.7.0 +monotonic>=1.4 [fixtures] fixtures>=3.0.0 @@ -18,12 +18,9 @@ [test] hacking!=0.13.0,<0.14,>=0.12.0 -testrepository>=0.0.18 -testtools>=2.2.0 +stestr>=2.0.0 +testtools>=2.3.0 mock>=2.0.0 -oslotest>=3.2.0 -coverage!=4.4,>=4.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2 -openstackdocstheme>=1.18.1 -reno>=2.5.0 +oslotest>=3.3.0 +coverage>=4.5.1 bandit>=1.1.0 diff -Nru python-oslo.log-3.39.0/oslo.log.egg-info/SOURCES.txt python-oslo.log-3.40.1/oslo.log.egg-info/SOURCES.txt --- python-oslo.log-3.39.0/oslo.log.egg-info/SOURCES.txt 2018-06-27 08:29:42.000000000 +0000 +++ python-oslo.log-3.40.1/oslo.log.egg-info/SOURCES.txt 2018-09-25 19:52:19.000000000 +0000 @@ -1,6 +1,6 @@ .coveragerc .mailmap -.testr.conf +.stestr.conf .zuul.yaml AUTHORS CONTRIBUTING.rst @@ -15,6 +15,7 @@ setup.py test-requirements.txt tox.ini +doc/requirements.txt doc/source/conf.py doc/source/index.rst doc/source/admin/advanced_config.rst @@ -109,6 +110,7 @@ releasenotes/source/ocata.rst releasenotes/source/pike.rst releasenotes/source/queens.rst +releasenotes/source/rocky.rst releasenotes/source/unreleased.rst releasenotes/source/_static/.placeholder releasenotes/source/_templates/.placeholder diff -Nru python-oslo.log-3.39.0/PKG-INFO python-oslo.log-3.40.1/PKG-INFO --- python-oslo.log-3.39.0/PKG-INFO 2018-06-27 08:29:43.000000000 +0000 +++ python-oslo.log-3.40.1/PKG-INFO 2018-09-25 19:52:19.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: oslo.log -Version: 3.39.0 +Version: 3.40.1 Summary: oslo.log library Home-page: https://docs.openstack.org/oslo.log/latest Author: OpenStack diff -Nru python-oslo.log-3.39.0/releasenotes/notes/reno.cache python-oslo.log-3.40.1/releasenotes/notes/reno.cache --- python-oslo.log-3.39.0/releasenotes/notes/reno.cache 2018-06-27 08:29:43.000000000 +0000 +++ python-oslo.log-3.40.1/releasenotes/notes/reno.cache 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ ---- -file-contents: {} -notes: [] diff -Nru python-oslo.log-3.39.0/releasenotes/source/index.rst python-oslo.log-3.40.1/releasenotes/source/index.rst --- python-oslo.log-3.39.0/releasenotes/source/index.rst 2018-06-27 08:26:18.000000000 +0000 +++ python-oslo.log-3.40.1/releasenotes/source/index.rst 2018-09-25 19:49:15.000000000 +0000 @@ -6,6 +6,7 @@ :maxdepth: 1 unreleased + rocky queens pike ocata diff -Nru python-oslo.log-3.39.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po python-oslo.log-3.40.1/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po --- python-oslo.log-3.39.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po 2018-06-27 08:26:18.000000000 +0000 +++ python-oslo.log-3.40.1/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po 2018-09-25 19:49:15.000000000 +0000 @@ -5,11 +5,11 @@ msgstr "" "Project-Id-Version: oslo.log Release Notes\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-09 00:09+0000\n" +"POT-Creation-Date: 2018-07-26 22:58+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2018-02-06 11:15+0000\n" +"PO-Revision-Date: 2018-08-08 09:51+0000\n" "Last-Translator: Andi Chandler \n" "Language-Team: English (United Kingdom)\n" "Language: en_GB\n" @@ -106,6 +106,9 @@ msgid "Queens Series Release Notes" msgstr "Queens Series Release Notes" +msgid "Rocky Series Release Notes" +msgstr "Rocky Series Release Notes" + msgid "Switch to reno for managing release notes." msgstr "Switch to reno for managing release notes." diff -Nru python-oslo.log-3.39.0/releasenotes/source/rocky.rst python-oslo.log-3.40.1/releasenotes/source/rocky.rst --- python-oslo.log-3.39.0/releasenotes/source/rocky.rst 1970-01-01 00:00:00.000000000 +0000 +++ python-oslo.log-3.40.1/releasenotes/source/rocky.rst 2018-09-25 19:49:15.000000000 +0000 @@ -0,0 +1,6 @@ +=================================== + Rocky Series Release Notes +=================================== + +.. release-notes:: + :branch: stable/rocky diff -Nru python-oslo.log-3.39.0/RELEASENOTES.rst python-oslo.log-3.40.1/RELEASENOTES.rst --- python-oslo.log-3.39.0/RELEASENOTES.rst 2018-06-27 08:29:43.000000000 +0000 +++ python-oslo.log-3.40.1/RELEASENOTES.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -======== -oslo.log -======== diff -Nru python-oslo.log-3.39.0/requirements.txt python-oslo.log-3.40.1/requirements.txt --- python-oslo.log-3.39.0/requirements.txt 2018-06-27 08:26:18.000000000 +0000 +++ python-oslo.log-3.40.1/requirements.txt 2018-09-25 19:49:15.000000000 +0000 @@ -2,14 +2,14 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr!=2.1.0,>=2.0.0 # Apache-2.0 -six>=1.10.0 # MIT +pbr>=3.1.1 # Apache-2.0 +six>=1.11.0 # MIT oslo.config>=5.2.0 # Apache-2.0 -oslo.context>=2.19.2 # Apache-2.0 -oslo.i18n>=3.15.3 # Apache-2.0 -oslo.utils>=3.33.0 # Apache-2.0 -oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 -debtcollector>=1.2.0 # Apache-2.0 +oslo.context>=2.20.0 # Apache-2.0 +oslo.i18n>=3.20.0 # Apache-2.0 +oslo.utils>=3.36.0 # Apache-2.0 +oslo.serialization>=2.25.0 # Apache-2.0 +debtcollector>=1.19.0 # Apache-2.0 pyinotify>=0.9.6;sys_platform!='win32' and sys_platform!='darwin' and sys_platform!='sunos5' # MIT -python-dateutil>=2.5.3 # BSD -monotonic>=0.6 # Apache-2.0 +python-dateutil>=2.7.0 # BSD +monotonic>=1.4 # Apache-2.0 diff -Nru python-oslo.log-3.39.0/setup.cfg python-oslo.log-3.40.1/setup.cfg --- python-oslo.log-3.39.0/setup.cfg 2018-06-27 08:29:43.000000000 +0000 +++ python-oslo.log-3.40.1/setup.cfg 2018-09-25 19:52:19.000000000 +0000 @@ -34,12 +34,6 @@ console_scripts = convert-json = oslo_log.cmds.convert_json:main -[build_sphinx] -all-files = 1 -warning-is-error = 1 -source-dir = doc/source -build-dir = doc/build - [upload_sphinx] upload-dir = doc/build/html diff -Nru python-oslo.log-3.39.0/.stestr.conf python-oslo.log-3.40.1/.stestr.conf --- python-oslo.log-3.39.0/.stestr.conf 1970-01-01 00:00:00.000000000 +0000 +++ python-oslo.log-3.40.1/.stestr.conf 2018-09-25 19:49:15.000000000 +0000 @@ -0,0 +1,3 @@ +[DEFAULT] +test_path=./oslo_log/tests/unit +top_dir=./ diff -Nru python-oslo.log-3.39.0/.testr.conf python-oslo.log-3.40.1/.testr.conf --- python-oslo.log-3.39.0/.testr.conf 2018-06-27 08:26:18.000000000 +0000 +++ python-oslo.log-3.40.1/.testr.conf 1970-01-01 00:00:00.000000000 +0000 @@ -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 ./ ./oslo_log $LISTOPT $IDOPTION -test_id_option=--load-list $IDFILE -test_list_option=--list diff -Nru python-oslo.log-3.39.0/test-requirements.txt python-oslo.log-3.40.1/test-requirements.txt --- python-oslo.log-3.39.0/test-requirements.txt 2018-06-27 08:26:18.000000000 +0000 +++ python-oslo.log-3.40.1/test-requirements.txt 2018-09-25 19:49:15.000000000 +0000 @@ -4,20 +4,15 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 -testrepository>=0.0.18 # Apache-2.0/BSD -testtools>=2.2.0 # MIT +stestr>=2.0.0 # Apache-2.0 +testtools>=2.3.0 # MIT mock>=2.0.0 # BSD -oslotest>=3.2.0 # Apache-2.0 +oslotest>=3.3.0 # Apache-2.0 # when we can require tox>= 1.4, this can go into tox.ini: # [testenv:cover] # deps = {[testenv]deps} coverage -coverage!=4.4,>=4.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 -reno>=2.5.0 # Apache-2.0 +coverage>=4.5.1 # Apache-2.0 # Bandit security code scanner bandit>=1.1.0 # Apache-2.0 diff -Nru python-oslo.log-3.39.0/tox.ini python-oslo.log-3.40.1/tox.ini --- python-oslo.log-3.39.0/tox.ini 2018-06-27 08:26:18.000000000 +0000 +++ python-oslo.log-3.40.1/tox.ini 2018-09-25 19:49:15.000000000 +0000 @@ -3,6 +3,8 @@ envlist = py35,py27,pep8 [testenv] +whitelist_externals = + find setenv = VIRTUAL_ENV={envdir} BRANCH_NAME=master @@ -11,8 +13,9 @@ deps = -r{toxinidir}/test-requirements.txt -e.[fixtures] commands = - python setup.py test --coverage --coverage-package-name=oslo_log --slowest --testr-args='{posargs}' - coverage report --show-missing + find . -type f -name "*.pyc" -delete + stestr run {posargs} + stestr slowest [testenv:pep8] basepython = python3 @@ -27,16 +30,22 @@ [testenv:docs] basepython = python3 -commands = python setup.py build_sphinx +deps = -r{toxinidir}/doc/requirements.txt +commands = sphinx-build -a -E -W -b html doc/source doc/build/html [testenv:releasenotes] basepython = python3 -commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html +deps = -r{toxinidir}/doc/requirements.txt +commands = sphinx-build -a -E -W -b html releasenotes/source releasenotes/build/html [testenv:cover] basepython = python3 commands = - python setup.py test --coverage --coverage-package-name=oslo_log --testr-args='{posargs}' + coverage erase + {[testenv]commands} + coverage combine + coverage html -d cover + coverage xml -o cover/coverage.xml coverage report --show-missing [testenv:bandit] @@ -52,7 +61,6 @@ [flake8] # E123, E125 skipped as they are invalid PEP-8. - show-source = True ignore = E123,E125,H405 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,__init__.py diff -Nru python-oslo.log-3.39.0/.zuul.yaml python-oslo.log-3.40.1/.zuul.yaml --- python-oslo.log-3.39.0/.zuul.yaml 2018-06-27 08:26:18.000000000 +0000 +++ python-oslo.log-3.40.1/.zuul.yaml 2018-09-25 19:49:15.000000000 +0000 @@ -22,3 +22,13 @@ gate: jobs: - openstack-tox-lower-constraints + templates: + - openstack-python-jobs + - openstack-python35-jobs + - publish-openstack-docs-pti + - check-requirements + - lib-forward-testing + - lib-forward-testing-python3 + - release-notes-jobs-python3 + - periodic-stable-jobs + - openstack-python36-jobs