diff options
| -rw-r--r-- | babel.cfg | 1 | ||||
| -rw-r--r-- | doc/requirements.txt | 6 | ||||
| -rw-r--r-- | doc/source/conf.py | 7 | ||||
| -rw-r--r-- | doc/source/index.rst | 12 | ||||
| -rw-r--r-- | lower-constraints.txt | 9 | ||||
| -rw-r--r-- | releasenotes/source/conf.py | 11 | ||||
| -rw-r--r-- | releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po | 29 | ||||
| -rw-r--r-- | setup.cfg | 14 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
9 files changed, 48 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 41665ed..a9033ab 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -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.20.0 # Apache-2.0 -sphinx>=1.8.0,!=2.1.0 # BSD -reno>=2.5.0 # Apache-2.0 +openstackdocstheme>=2.2.0 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD +reno>=3.1.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD sphinxcontrib-apidoc>=0.2.0 # BSD diff --git a/doc/source/conf.py b/doc/source/conf.py index 8cece1b..d606cda 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -22,15 +22,14 @@ extensions = [ ] # openstackdocstheme options -repository_name = 'openstack/oslo.vmware' -bug_project = 'oslo.vmware' -bug_tag = '' +openstackdocs_repo_name = 'openstack/oslo.vmware' +openstackdocs_bug_project = 'oslo.vmware' +openstackdocs_bug_tag = '' # The master toctree document. master_doc = 'index' # General information about the project. -project = u'oslo.vmware' copyright = u'2014, OpenStack Foundation' # If true, '()' will be appended to :func: etc. cross-reference text. diff --git a/doc/source/index.rst b/doc/source/index.rst index b5e6d74..ccb57c1 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -5,6 +5,9 @@ The Oslo VMware library provides support for common VMware operations and APIs. +Contents +======== + .. toctree:: :maxdepth: 2 @@ -13,7 +16,14 @@ and APIs. contributor/index reference/index -.. rubric:: Indices and tables +Release Notes +============= + +Read also the `oslo.vmware Release Notes +<https://docs.openstack.org/releasenotes/oslo.vmware/>`_. + +Indices and tables +================== * :ref:`genindex` * :ref:`modindex` diff --git a/lower-constraints.txt b/lower-constraints.txt index 2bd229a..838e186 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -10,42 +10,33 @@ eventlet==0.18.2 extras==1.0.0 fasteners==0.7.0 fixtures==3.0.0 -flake8==2.5.5 gitdb==0.6.4 GitPython==1.0.1 greenlet==0.4.10 -hacking==0.12.0 imagesize==0.7.1 iso8601==0.1.11 Jinja2==2.10 linecache2==1.0.0 lxml==3.4.1 MarkupSafe==1.0 -mccabe==0.2.1 netaddr==0.7.18 netifaces==0.10.4 -openstackdocstheme==1.20.0 oslo.concurrency==3.26.0 oslo.config==5.2.0 oslo.context==2.19.2 oslo.i18n==3.15.3 oslo.utils==3.33.0 pbr==2.0.0 -pep8==1.5.7 -pyflakes==0.8.1 Pygments==2.2.0 pyparsing==2.1.0 python-mimeparse==1.6.0 python-subunit==1.0.0 pytz==2013.6 PyYAML==3.12 -reno==2.5.0 requests==2.14.2 rfc3986==0.3.1 smmap==0.9.0 snowballstemmer==1.2.1 -Sphinx==1.8.0 -sphinxcontrib-websupport==1.0.1 stestr==2.0.0 stevedore==1.20.0 suds-jurko==0.6 diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 9b162b5..9245760 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -40,9 +40,10 @@ extensions = [ ] # openstackdocstheme options -repository_name = 'openstack/oslo.vmware' -bug_project = 'oslo.vmware' -bug_tag = '' +openstackdocs_repo_name = 'openstack/oslo.vmware' +openstackdocs_bug_project = 'oslo.vmware' +openstackdocs_bug_tag = '' +openstackdocs_auto_name = False # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] @@ -146,10 +147,6 @@ html_static_path = ['_static'] # 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 diff --git a/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po b/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po index 9c24ad6..b227a64 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.vmware\n" +"Project-Id-Version: oslo.vmware Release Notes\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-13 07:06+0000\n" +"POT-Creation-Date: 2020-05-19 14:35+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 07:53+0000\n" +"PO-Revision-Date: 2020-05-04 09:28+0000\n" "Last-Translator: Andi Chandler <andi@gowling.com>\n" "Language-Team: English (United Kingdom)\n" "Language: en_GB\n" @@ -19,6 +20,9 @@ msgstr "" msgid "2.8.0" msgstr "2.8.0" +msgid "3.0.0" +msgstr "3.0.0" + msgid "Newton Series Release Notes" msgstr "Newton Series Release Notes" @@ -37,11 +41,30 @@ 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 "" +"Support for Python 2.7 has been dropped. The minimum version of Python now " +"supported is Python 3.6." +msgstr "" +"Support for Python 2.7 has been dropped. The minimum version of Python now " +"supported is Python 3.6." + msgid "Switch to reno for managing release notes." msgstr "Switch to reno for managing release notes." +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 "oslo.vmware Release Notes" msgstr "oslo.vmware Release Notes" @@ -24,17 +24,3 @@ classifier = [files] packages = oslo_vmware - -[compile_catalog] -directory = oslo_vmware/locale -domain = oslo_vmware - -[update_catalog] -domain = oslo_vmware -output_dir = oslo_vmware/locale -input_file = oslo_vmware/locale/oslo_vmware.pot - -[extract_messages] -keywords = _ gettext ngettext l_ lazy_gettext -mapping_file = babel.cfg -output_file = oslo_vmware/locale/oslo_vmware.pot diff --git a/test-requirements.txt b/test-requirements.txt index 65fa4f8..4663c58 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,7 +3,7 @@ # process, which may cause wedges in the gate later. # Hacking already pins down pep8, pyflakes and flake8 -hacking>=3.0,<3.1.0 # Apache-2.0 +hacking>=3.0.1,<3.1.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD testtools>=2.2.0 # MIT |