diff options
| -rw-r--r-- | babel.cfg | 1 | ||||
| -rw-r--r-- | doc/requirements.txt | 6 | ||||
| -rw-r--r-- | doc/source/conf.py | 6 | ||||
| -rw-r--r-- | lower-constraints.txt | 10 | ||||
| -rw-r--r-- | oslo_log/locale/en_GB/LC_MESSAGES/oslo_log.po | 8 | ||||
| -rw-r--r-- | oslo_log/rate_limit.py | 6 | ||||
| -rw-r--r-- | releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po | 48 | ||||
| -rw-r--r-- | requirements.txt | 1 | ||||
| -rw-r--r-- | setup.cfg | 15 | ||||
| -rw-r--r-- | tox.ini | 2 |
10 files changed, 60 insertions, 43 deletions
diff --git a/babel.cfg b/babel.cfg deleted file mode 100644 index efceab8..0000000 --- a/babel.cfg +++ /dev/null @@ -1 +0,0 @@ -[python: **.py] diff --git a/doc/requirements.txt b/doc/requirements.txt index 60c6927..0393239 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -2,9 +2,9 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -sphinx>=1.8.0,!=2.1.0 # BSD -openstackdocstheme>=1.20.0 # Apache-2.0 -reno>=2.5.0 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD +openstackdocstheme>=2.2.1 # Apache-2.0 +reno>=3.1.0 # Apache-2.0 # Optional dependencies that are needed to build docs fixtures>=3.0.0 # Apache-2.0/BSD diff --git a/doc/source/conf.py b/doc/source/conf.py index e34e806..f9127aa 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -28,9 +28,9 @@ extensions = [ ] # openstackdocstheme options -repository_name = 'openstack/oslo.log' -bug_project = 'oslo.log' -bug_tag = '' +openstackdocs_repo_name = 'openstack/oslo.log' +openstackdocs_bug_project = 'oslo.log' +openstackdocs_bug_tag = '' # The master toctree document. master_doc = 'index' diff --git a/lower-constraints.txt b/lower-constraints.txt index fa7175d..8ece6b6 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -10,10 +10,8 @@ docutils==0.14 dulwich==0.19.0 extras==1.0.0 fixtures==3.0.0 -flake8==2.5.5 gitdb2==2.0.3 GitPython==2.1.8 -hacking==2.0.0 idna==2.6 imagesize==1.0.0 iso8601==0.1.12 @@ -21,14 +19,11 @@ Jinja2==2.10 keystoneauth1==3.4.0 linecache2==1.0.0 MarkupSafe==1.0 -mccabe==0.2.1 -monotonic==1.4;python_version<'3.3' mox3==0.25.0 msgpack==0.5.6 netaddr==0.7.19 netifaces==0.10.6 openstack-requirements==1.2.0 -openstackdocstheme==1.20.0 os-client-config==1.29.0 oslo.config==5.2.0 oslo.context==2.20.0 @@ -39,8 +34,6 @@ oslotest==3.3.0 packaging==17.1 Parsley==1.3 pbr==3.1.1 -pep8==1.5.7 -pyflakes==0.8.1 Pygments==2.2.0 pyinotify==0.9.6 pyparsing==2.2.0 @@ -49,14 +42,11 @@ python-mimeparse==1.6.0 python-subunit==1.2.0 pytz==2018.3 PyYAML==3.12 -reno==2.7.0 requests==2.18.4 requestsexceptions==1.4.0 rfc3986==1.1.0 smmap2==2.0.3 snowballstemmer==1.2.1 -Sphinx==1.8.0 -sphinxcontrib-websupport==1.0.1 stestr==2.0.0 stevedore==1.28.0 systemd-python==234 diff --git a/oslo_log/locale/en_GB/LC_MESSAGES/oslo_log.po b/oslo_log/locale/en_GB/LC_MESSAGES/oslo_log.po index fd0168b..38f4b5c 100644 --- a/oslo_log/locale/en_GB/LC_MESSAGES/oslo_log.po +++ b/oslo_log/locale/en_GB/LC_MESSAGES/oslo_log.po @@ -1,13 +1,14 @@ # Andi Chandler <andi@gowling.com>, 2016. #zanata +# Andi Chandler <andi@gowling.com>, 2020. #zanata msgid "" msgstr "" "Project-Id-Version: oslo.log VERSION\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n" -"POT-Creation-Date: 2018-02-09 00:09+0000\n" +"POT-Creation-Date: 2020-04-14 15:41+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2016-06-28 05:56+0000\n" +"PO-Revision-Date: 2020-04-16 12:37+0000\n" "Last-Translator: Andi Chandler <andi@gowling.com>\n" "Language-Team: English (United Kingdom)\n" "Language: en_GB\n" @@ -50,6 +51,9 @@ msgstr "Error loading logging config %(log_config)s: %(err_msg)s" msgid "Fatal call to deprecated config: %(msg)s" msgstr "Fatal call to deprecated config: %(msg)s" +msgid "Windows Event Log is not available on this platform." +msgstr "Windows Event Log is not available on this platform." + #, python-format msgid "syslog facility must be one of: %s" msgstr "syslog facility must be one of: %s" diff --git a/oslo_log/rate_limit.py b/oslo_log/rate_limit.py index ae486ab..05ad581 100644 --- a/oslo_log/rate_limit.py +++ b/oslo_log/rate_limit.py @@ -14,11 +14,7 @@ import logging - -try: - from time import monotonic as monotonic_clock # noqa -except ImportError: - from monotonic import monotonic as monotonic_clock # noqa +from time import monotonic as monotonic_clock class _LogRateLimit(logging.Filter): diff --git a/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po b/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po index e79651f..7a48fd2 100644 --- a/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po +++ b/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po @@ -1,15 +1,16 @@ # Andi Chandler <andi@gowling.com>, 2016. #zanata # Andi Chandler <andi@gowling.com>, 2017. #zanata # Andi Chandler <andi@gowling.com>, 2018. #zanata +# Andi Chandler <andi@gowling.com>, 2020. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.log Release Notes\n" +"Project-Id-Version: oslo.log\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-26 22:58+0000\n" +"POT-Creation-Date: 2020-04-14 15:41+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2018-08-08 09:51+0000\n" +"PO-Revision-Date: 2020-04-16 12:37+0000\n" "Last-Translator: Andi Chandler <andi@gowling.com>\n" "Language-Team: English (United Kingdom)\n" "Language: en_GB\n" @@ -49,9 +50,18 @@ msgstr "3.34.0" msgid "3.35.0" msgstr "3.35.0" +msgid "3.41.0" +msgstr "3.41.0" + +msgid "3.42.0" +msgstr "3.42.0" + msgid "3.8.0" msgstr "3.8.0" +msgid "4.0.0" +msgstr "4.0.0" + msgid "" "A new ``oslo_log.log.is_debug_enabled`` helper function is added that allows " "to determine whether debug mode is enabled for logging." @@ -59,6 +69,13 @@ msgstr "" "A new ``oslo_log.log.is_debug_enabled`` helper function is added that allows " "to determine whether debug mode is enabled for logging." +msgid "" +"Added Windows EventLog functionality to oslo.log. Set use_eventlog to true " +"in the service's configuration file to use it." +msgstr "" +"Added Windows EventLog functionality to oslo.log. Set use_eventlog to true " +"in the service's configuration file to use it." + msgid "Bug Fixes" msgstr "Bug Fixes" @@ -103,12 +120,22 @@ msgstr "Other Notes" msgid "Pike Series Release Notes" msgstr "Pike Series Release Notes" +msgid "" +"Python 2.7 is no longer supported. The minimum supported version of Python " +"is now Python 3.6." +msgstr "" +"Python 2.7 is no longer supported. The minimum supported version of Python " +"is now Python 3.6." + msgid "Queens Series Release Notes" msgstr "Queens Series Release Notes" msgid "Rocky Series Release Notes" msgstr "Rocky Series Release Notes" +msgid "Stein Series Release Notes" +msgstr "Stein Series Release Notes" + msgid "Switch to reno for managing release notes." msgstr "Switch to reno for managing release notes." @@ -158,6 +185,15 @@ msgstr "" "The deprecated use_syslog_rfc_format configuration option has been removed." msgid "" +"The following new config options will allow rotating log files, especially " +"useful on Windows: * ``log_rotate_interval`` * ``log_rotate_interval_type`` " +"* ``max_logfile_count`` * ``max_logfile_size_mb`` * ``log_rotation_type``" +msgstr "" +"The following new config options will allow rotating log files, especially " +"useful on Windows: * ``log_rotate_interval`` * ``log_rotate_interval_type`` " +"* ``max_logfile_count`` * ``max_logfile_size_mb`` * ``log_rotation_type``" + +msgid "" "The log_config_append configuration option is now mutable and the logging " "settings it controls are reconfigured when the configuration file is reread. " "This can be used to, for example, change logger or handler levels." @@ -175,12 +211,18 @@ msgstr "" "the logs when set to True. The option is also available through the command " "line via the ``--use-json`` flag." +msgid "Train Series Release Notes" +msgstr "Train Series Release Notes" + msgid "Unreleased Release Notes" msgstr "Unreleased Release Notes" msgid "Upgrade Notes" msgstr "Upgrade Notes" +msgid "Ussuri Series Release Notes" +msgstr "Ussuri Series Release Notes" + msgid "" "When removing the \"verbose\" option, the default logging level was set to " "\"WARNING\" by mistake. Fixed it back to \"INFO\"." diff --git a/requirements.txt b/requirements.txt index 963a95e..04331e4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,4 +11,3 @@ 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.7.0 # BSD -monotonic>=1.4;python_version<'3.3' # Apache-2.0 @@ -17,6 +17,7 @@ classifier = Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 Programming Language :: Python :: 3 :: Only Programming Language :: Python :: Implementation :: CPython @@ -35,17 +36,3 @@ oslo.config.opts = oslo.log = oslo_log._options:list_opts console_scripts = convert-json = oslo_log.cmds.convert_json:main - -[compile_catalog] -directory = oslo_log/locale -domain = oslo_log - -[update_catalog] -domain = oslo_log -output_dir = oslo_log/locale -input_file = oslo_log/locale/oslo_log.pot - -[extract_messages] -keywords = _ gettext ngettext l_ lazy_gettext -mapping_file = babel.cfg -output_file = oslo_log/locale/oslo_log.pot @@ -1,6 +1,6 @@ [tox] minversion = 3.1 -envlist = py36,py37,pep8 +envlist = py36,py38,pep8 ignore_basepython_conflict = true [testenv] |