summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/source/conf.py8
-rw-r--r--doc/source/specification/resources.rst2
-rw-r--r--lower-constraints.txt4
-rw-r--r--test-requirements.txt4
4 files changed, 9 insertions, 9 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 03b99e2..2167d9f 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -81,7 +81,7 @@ exclude_patterns = ['_build']
#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 = []
@@ -241,6 +241,6 @@ texinfo_documents = [
#texinfo_no_detailmenu = False
# -- Options for openstackdocstheme -------------------------------------------
-repository_name = 'openstack/pycadf'
-bug_project = 'pycadf'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/pycadf'
+openstackdocs_bug_project = 'pycadf'
+openstackdocs_bug_tag = ''
diff --git a/doc/source/specification/resources.rst b/doc/source/specification/resources.rst
index 830f445..a9c92d1 100644
--- a/doc/source/specification/resources.rst
+++ b/doc/source/specification/resources.rst
@@ -37,7 +37,7 @@ addresses cadf:Endpoint[] No The optional descriptive addresses (in
host cadf:Host No The optional information about the (network) host of the resource
geolocation cadf:Geolocation Dependent This optional property describes the geographic location of the resource using Geolocation data type. Required if not geolocationId
geolocationId cadf:Identifier Dependent This optional property identifies a CADF Geolocation by reference. Required if not geolocation
-attachments cadf:Attachment[] No An optional array of extended or domain-specific information about the resource or its contex
+attachments cadf:Attachment[] No An optional array of extended or domain-specific information about the resource or its context
============= ================= ========= ===================================================================================================================================
Serialisation
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 3d81a75..1abd292 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -20,7 +20,7 @@ mox3==0.20.0
msgpack-python==0.4.0
netaddr==0.7.18
netifaces==0.10.4
-openstackdocstheme==1.20.0
+openstackdocstheme==2.2.1
os-client-config==1.28.0
oslo.config==5.2.0
oslo.i18n==3.15.3
@@ -40,7 +40,7 @@ requestsexceptions==1.2.0
rfc3986==0.3.1
six==1.10.0
snowballstemmer==1.2.1
-Sphinx==1.6.2
+Sphinx==2.0.0
sphinxcontrib-apidoc===0.2.0
sphinxcontrib-websupport==1.0.1
stevedore==1.20.0
diff --git a/test-requirements.txt b/test-requirements.txt
index c6b0ddb..0d0f7f6 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,6 +12,6 @@ stestr>=2.0.0 # Apache-2.0
testtools>=2.2.0 # MIT
# this is required for the docs build jobs
-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