Bring tests to current openstack release
Switch from oslosphinx to openstackdocstheme
That's what the OpenStack community is using today. Also with newer
Sphinx versions, the current approach does no longer build.
Re-add docs and requirements tests.
Switch to xena standard jobs.
Conflicts:
    doc/requirements.txt
    requirements.txt
    test-requirements.txt
Change-Id: I3f93a400bb83f4a91bd77ebe69f609949cd43ca7
(cherry picked from commit 21a184bff2)
(cherry picked from commit f6fc6cf1a6)
			
			
This commit is contained in:
		
				
					committed by
					
						
						Vanou Ishii
					
				
			
			
				
	
			
			
			
						parent
						
							f68c591fb6
						
					
				
				
					commit
					c06de62f36
				
			@@ -1,3 +1,5 @@
 | 
			
		||||
- project:
 | 
			
		||||
    templates:
 | 
			
		||||
      - openstack-python3-wallaby-jobs
 | 
			
		||||
      - check-requirements
 | 
			
		||||
      - openstack-python3-xena-jobs
 | 
			
		||||
      - publish-openstack-docs-pti
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,2 @@
 | 
			
		||||
 | 
			
		||||
sphinx!=1.6.6,!=1.6.7,>=1.6.2
 | 
			
		||||
oslosphinx>=4.7.0 # Apache-2.0
 | 
			
		||||
sphinx!=1.6.6,!=1.6.7,>=2.0.0,!=2.1.0,!=3.0.0;python_version>='3.4' # BSD
 | 
			
		||||
openstackdocstheme>=2.2.1 # Apache-2.0
 | 
			
		||||
 
 | 
			
		||||
@@ -22,8 +22,7 @@ sys.path.insert(0, os.path.abspath('../..'))
 | 
			
		||||
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 | 
			
		||||
extensions = [
 | 
			
		||||
    'sphinx.ext.autodoc',
 | 
			
		||||
    #'sphinx.ext.intersphinx',
 | 
			
		||||
    'oslosphinx'
 | 
			
		||||
    'openstackdocstheme'
 | 
			
		||||
]
 | 
			
		||||
 | 
			
		||||
# autodoc generation is a bit aggressive and a nuisance when doing heavy
 | 
			
		||||
@@ -57,6 +56,7 @@ pygments_style = 'sphinx'
 | 
			
		||||
# html_theme_path = ["."]
 | 
			
		||||
# html_theme = '_theme'
 | 
			
		||||
# html_static_path = ['static']
 | 
			
		||||
html_theme = 'openstackdocs'
 | 
			
		||||
 | 
			
		||||
# Output file base name for HTML help builder.
 | 
			
		||||
htmlhelp_basename = '%sdoc' % project
 | 
			
		||||
@@ -73,3 +73,6 @@ latex_documents = [
 | 
			
		||||
 | 
			
		||||
# Example configuration for intersphinx: refer to the Python standard library.
 | 
			
		||||
#intersphinx_mapping = {'http://docs.python.org/': None}
 | 
			
		||||
 | 
			
		||||
# openstackdocstheme options
 | 
			
		||||
openstackdocs_repo_name = 'x/python-scciclient'
 | 
			
		||||
 
 | 
			
		||||
@@ -7,5 +7,5 @@ pyghmi>=1.0.24 # Apache-2.0
 | 
			
		||||
pysnmp>=4.2.3 # BSD
 | 
			
		||||
requests>=2.14.2 # Apache-2.0
 | 
			
		||||
six>=1.10.0 # MIT
 | 
			
		||||
oslo.utils>=3.33.0 # Apache-2.0
 | 
			
		||||
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
 | 
			
		||||
oslo.utils!=3.39.1,!=3.40.0,!=3.40.1,>=3.33.0;python_version>='3.0' # Apache-2.0
 | 
			
		||||
oslo.serialization!=2.19.1,>=2.18;python_version>='3.0' # Apache-2.0
 | 
			
		||||
 
 | 
			
		||||
@@ -6,9 +6,8 @@ coverage!=4.4,>=4.0 # Apache-2.0
 | 
			
		||||
fixtures>=3.0.0 # Apache-2.0/BSD
 | 
			
		||||
mock>=2.0.0 # BSD
 | 
			
		||||
python-subunit>=1.0.0 # Apache-2.0/BSD
 | 
			
		||||
oslotest>=3.2.0,<4;python_version<'3.6'  # Apache-2.0
 | 
			
		||||
oslotest>=3.2.0;python_version>='3.6'  # Apache-2.0
 | 
			
		||||
stestr>=2.0.0,!=2.3.0,!=3.0.0  # Apache-2.0
 | 
			
		||||
oslotest>=3.2.0 # Apache-2.0
 | 
			
		||||
stestr>=2.0.0,!=2.3.0 # Apache-2.0
 | 
			
		||||
testscenarios>=0.4 # Apache-2.0/BSD
 | 
			
		||||
testtools>=2.2.0 # MIT
 | 
			
		||||
requests-mock>=1.2.0 # Apache-2.0
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user