diff options
| -rw-r--r-- | .zuul.yaml | 2 | ||||
| -rw-r--r-- | doc/requirements.txt | 6 | ||||
| -rw-r--r-- | doc/source/conf.py | 9 | ||||
| -rw-r--r-- | keystoneclient/base.py | 4 | ||||
| -rw-r--r-- | releasenotes/source/conf.py | 8 | ||||
| -rw-r--r-- | releasenotes/source/index.rst | 1 | ||||
| -rw-r--r-- | releasenotes/source/ussuri.rst | 6 | ||||
| -rw-r--r-- | setup.cfg | 1 | ||||
| -rw-r--r-- | test-requirements.txt | 3 | ||||
| -rw-r--r-- | tox.ini | 8 |
10 files changed, 27 insertions, 21 deletions
@@ -19,7 +19,7 @@ templates: - openstack-cover-jobs - openstack-lower-constraints-jobs - - openstack-python3-ussuri-jobs + - openstack-python3-victoria-jobs - publish-openstack-docs-pti - check-requirements - lib-forward-testing-python3 diff --git a/doc/requirements.txt b/doc/requirements.txt index 1da2c50..b7e4e97 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -3,9 +3,9 @@ # process, which may cause wedges in the gate later. # These are needed for docs generation -openstackdocstheme>=1.20.0 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +openstackdocstheme>=2.2.1 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD sphinxcontrib-apidoc>=0.2.0 # BSD -reno>=2.5.0 # Apache-2.0 +reno>=3.1.0 # Apache-2.0 lxml!=3.7.0,>=3.4.1 # BSD fixtures>=3.0.0 # Apache-2.0/BSD diff --git a/doc/source/conf.py b/doc/source/conf.py index 1dd272a..e74410d 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -84,7 +84,7 @@ add_module_names = True #show_authors = False # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = 'native' # A list of ignored prefixes for module index sorting. modindex_common_prefix = ['keystoneclient.'] @@ -227,6 +227,7 @@ intersphinx_mapping = { } # -- Options for openstackdocstheme ------------------------------------------- -repository_name = 'openstack/python-keystoneclient' -bug_project = 'python-keystoneclient' -bug_tag = '' +openstackdocs_repo_name = 'openstack/python-keystoneclient' +openstackdocs_bug_project = 'python-keystoneclient' +openstackdocs_bug_tag = '' +openstackdocs_pdf_link = True diff --git a/keystoneclient/base.py b/keystoneclient/base.py index f5e38eb..e796934 100644 --- a/keystoneclient/base.py +++ b/keystoneclient/base.py @@ -555,7 +555,7 @@ class Resource(object): except UnicodeEncodeError: # This happens when we're running with Python version that # does not support Unicode identifiers (e.g. Python 2.7). - # In that case we can't help but not set this attrubute; + # In that case we can't help but not set this attribute; # it'll be available in a dict representation though pass self._info[k] = v @@ -564,7 +564,7 @@ class Resource(object): pass def __getattr__(self, k): - """Checking attrbiute existence.""" + """Checking attribute existence.""" if k not in self.__dict__: # NOTE(bcwaldon): disallow lazy-loading if already loaded once if not self.is_loaded(): diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index b06cddf..dc65fbe 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -92,7 +92,7 @@ exclude_patterns = [] # show_authors = False # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = 'native' # A list of ignored prefixes for module index sorting. # modindex_common_prefix = [] @@ -257,6 +257,6 @@ texinfo_documents = [ locale_dirs = ['locale/'] # -- Options for openstackdocstheme ------------------------------------------- -repository_name = 'openstack/python-keystoneclient' -bug_project = 'python-keystoneclient' -bug_tag = '' +openstackdocs_repo_name = 'openstack/python-keystoneclient' +openstackdocs_bug_project = 'python-keystoneclient' +openstackdocs_bug_tag = '' diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index 5fcb304..71b3c14 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -6,6 +6,7 @@ :maxdepth: 1 unreleased + ussuri train stein rocky diff --git a/releasenotes/source/ussuri.rst b/releasenotes/source/ussuri.rst new file mode 100644 index 0000000..e21e50e --- /dev/null +++ b/releasenotes/source/ussuri.rst @@ -0,0 +1,6 @@ +=========================== +Ussuri Series Release Notes +=========================== + +.. release-notes:: + :branch: stable/ussuri @@ -17,6 +17,7 @@ classifier = Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 [files] packages = diff --git a/test-requirements.txt b/test-requirements.txt index 88e9b8c..d10c336 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,8 +7,7 @@ flake8-docstrings==0.2.1.post1 # MIT coverage!=4.4,>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD -keyring>=5.5.1,<19.0.0;python_version=='2.7' # MIT/PSF -keyring>=5.5.1;python_version>='3.4' # MIT/PSF +keyring>=5.5.1 # MIT/PSF lxml!=3.7.0,>=3.4.1 # BSD oauthlib>=0.6.2 # BSD os-client-config>=1.28.0 # Apache-2.0 @@ -1,14 +1,12 @@ [tox] -minversion = 3.1.1 +minversion = 3.2.0 skipsdist = True -envlist = py37,pep8,releasenotes +envlist = py38,pep8,releasenotes ignore_basepython_conflict = True [testenv] usedevelop = True -install_command = pip install {opts} {packages} -setenv = VIRTUAL_ENV={envdir} - OS_STDOUT_NOCAPTURE=False +setenv = OS_STDOUT_NOCAPTURE=False OS_STDERR_NOCAPTURE=False deps = |