Update spec repo config

* Updates spec repository with pike specs.
* Update requirements and doc config to match the latest updates to doc
  configurations in other projects

Change-Id: I7e19a62457c41ffa728f446c5c24f49fa2394be4
This commit is contained in:
Kirill Zaitsev 2017-06-02 13:09:31 +03:00
parent fcb45347fb
commit d4db3d5683
6 changed files with 23 additions and 11 deletions

View File

@ -33,6 +33,7 @@ extensions = ['redirect',
'sphinx.ext.autodoc',
'sphinx.ext.todo',
'sphinx.ext.viewcode',
'oslosphinx',
'yasfb',
]
@ -126,10 +127,8 @@ man_pages = []
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local",
"-n1"]
html_last_updated_fmt = subprocess.Popen(
git_cmd, stdout=subprocess.PIPE).communicate()[0]
git_cmd = "git log --pretty=format:'%ad, commit %h' --date=local -n1"
html_last_updated_fmt = os.popen(git_cmd).read()
# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.

View File

@ -45,6 +45,14 @@ Ocata specs:
specs/ocata/approved/*
Pike specs:
.. toctree::
:glob:
:maxdepth: 1
specs/pike/approved/*
==========================
Murano apps Specifications
==========================

View File

@ -2,8 +2,9 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
pbr>=0.6,!=0.7,<1.0
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
testrepository>=0.0.18
testtools>=0.9.34
yasfb
pbr>=2.0.0,!=2.1.0 # Apache-2.0
oslosphinx>=4.7.0 # Apache-2.0
sphinx>=1.5.1 # BSD
testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=1.4.0 # MIT
yasfb>=0.5.1,!=0.6.0

View File

@ -12,6 +12,7 @@ classifier =
Operating System :: POSIX :: Linux
[build_sphinx]
builders = html
all_files = 1
build-dir = doc/build
source-dir = doc/source

View File

@ -18,5 +18,5 @@
import setuptools
setuptools.setup(
setup_requires=['pbr'],
setup_requires=['pbr>=2.0'],
pbr=True)

View File

@ -10,12 +10,15 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -U {opts} {packages}
deps = -r{toxinidir}/requirements.txt
commands = python setup.py testr --slowest --testr-args='{posargs}'
whitelist_externals = find
[testenv:venv]
commands = {posargs}
[testenv:docs]
commands = python setup.py build_sphinx
commands =
find . -type f -name "*.pyc" -delete
python setup.py build_sphinx
[testenv:doc8]
deps =