diff options
| -rw-r--r-- | .zuul.yaml | 1 | ||||
| -rw-r--r-- | oslo_log/formatters.py | 2 | ||||
| -rw-r--r-- | oslo_log/versionutils.py | 2 | ||||
| -rw-r--r-- | setup.cfg | 2 | ||||
| -rw-r--r-- | tox.ini | 2 |
5 files changed, 5 insertions, 4 deletions
@@ -56,7 +56,6 @@ - lib-forward-testing-python3 - openstack-lower-constraints-jobs - openstack-python-jobs - - openstack-python35-jobs - openstack-python36-jobs - periodic-stable-jobs - publish-openstack-docs-pti diff --git a/oslo_log/formatters.py b/oslo_log/formatters.py index 0ed54f8..3c50899 100644 --- a/oslo_log/formatters.py +++ b/oslo_log/formatters.py @@ -181,7 +181,7 @@ class _ReplaceFalseValue(dict): return dict.get(self, key, None) or '-' -_MSG_KEY_REGEX = re.compile('(%+)\((\w+)\)') +_MSG_KEY_REGEX = re.compile(r'(%+)\((\w+)\)') class JSONFormatter(logging.Formatter): diff --git a/oslo_log/versionutils.py b/oslo_log/versionutils.py index fc031de..20bb12a 100644 --- a/oslo_log/versionutils.py +++ b/oslo_log/versionutils.py @@ -72,6 +72,7 @@ _RELEASES = { 'Q': 'Queens', 'R': 'Rocky', 'S': 'Stein', + 'T': 'Train', } @@ -148,6 +149,7 @@ class deprecated(object): QUEENS = 'Q' ROCKY = 'R' STEIN = 'S' + TRAIN = 'T' def __init__(self, as_of, in_favor_of=None, remove_in=2, what=None): """Initialize decorator @@ -16,7 +16,7 @@ classifier = Programming Language :: Python :: 2 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 [files] packages = @@ -1,6 +1,6 @@ [tox] minversion = 2.0 -envlist = py35,py27,pep8 +envlist = py36,py27,pep8 [testenv] whitelist_externals = |