diff --git a/doc/requirements.txt b/doc/requirements.txt index 4049654..a475cfa 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -8,8 +8,8 @@ # # Requirements for docs mock>=2.0.0 # BSD -openstackdocstheme>=1.18.1 # Apache-2.0 -reno>=2.5.0 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD +openstackdocstheme>=2.2.1 # Apache-2.0 +reno>=3.1.0 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD sphinxcontrib-apidoc>=0.2.0 # BSD diff --git a/doc/source/conf.py b/doc/source/conf.py index 9b55bc5..2a53a64 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -22,15 +22,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. -from __future__ import print_function - import os import sys import django -from zaqar_ui import version as zaqarui_ver - BASE_DIR = os.path.dirname(os.path.abspath(__file__)) ROOT = os.path.abspath(os.path.join(BASE_DIR, "..", "..")) @@ -81,14 +77,6 @@ master_doc = 'index' project = u'Zaqar UI' copyright = u'2015, Catalyst IT Ltd' -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -# The short X.Y version. -version = zaqarui_ver.version_info.version_string() -# The full version, including alpha/beta/rc tags. -release = zaqarui_ver.version_info.release_string() # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -120,7 +108,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 = [] @@ -142,9 +130,10 @@ apidoc_excluded_paths = [ html_theme = 'openstackdocs' # openstackdocstheme options -repository_name = 'openstack/zaqar-ui' -bug_project = 'zaqar-ui' -bug_tag = '' +openstackdocs_repo_name = 'openstack/zaqar-ui' +openstackdocs_auto_name = False +openstackdocs_bug_project = 'zaqar-ui' +openstackdocs_bug_tag = '' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the @@ -175,9 +164,6 @@ bug_tag = '' # so a file named "default.css" will overwrite the builtin "default.css". # html_static_path = [''] -# Must set this variable to include year, month, day, hours, and minutes. -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/lower-constraints.txt b/lower-constraints.txt index 09b7722..4f8fb70 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -48,7 +48,6 @@ munch==2.2.0 netaddr==0.7.19 netifaces==0.10.6 nodeenv==0.9.4 -openstackdocstheme==1.18.1 openstacksdk==0.12.0 os-client-config==1.29.0 os-service-types==1.2.0 @@ -88,7 +87,6 @@ python-zaqarclient==1.0.0 pytz==2018.3 PyYAML==3.12 rcssmin==1.0.6 -reno==2.5.0 requests==2.18.4 requestsexceptions==1.4.0 rfc3986==1.1.0 @@ -98,9 +96,6 @@ semantic-version==2.6.0 simplejson==3.13.2 six==1.11.0 snowballstemmer==1.2.1 -Sphinx==1.6.2 -sphinxcontrib-apidoc===0.2.0 -sphinxcontrib-websupport==1.0.1 stevedore==1.28.0 termcolor==1.1.0 testtools==2.2.0 diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 59328ff..134a54b 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -91,7 +91,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 = [] @@ -107,9 +107,10 @@ pygments_style = 'sphinx' html_theme = 'openstackdocs' # openstackdocstheme options -repository_name = 'openstack/zaqar-ui' -bug_project = 'zaqar-ui' -bug_tag = '' +openstackdocs_repo_name = 'openstack/zaqar-ui' +openstackdocs_auto_name = False +openstackdocs_bug_project = 'zaqar-ui' +openstackdocs_bug_tag = '' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the @@ -145,9 +146,6 @@ bug_tag = '' # directly to the root of the documentation. # html_extra_path = [] -# Must set this variable to include year, month, day, hours, and minutes. -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