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:
parent
fcb45347fb
commit
d4db3d5683
|
@ -33,6 +33,7 @@ extensions = ['redirect',
|
||||||
'sphinx.ext.autodoc',
|
'sphinx.ext.autodoc',
|
||||||
'sphinx.ext.todo',
|
'sphinx.ext.todo',
|
||||||
'sphinx.ext.viewcode',
|
'sphinx.ext.viewcode',
|
||||||
|
'oslosphinx',
|
||||||
'yasfb',
|
'yasfb',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -126,10 +127,8 @@ man_pages = []
|
||||||
|
|
||||||
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
|
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
|
||||||
# using the given strftime format.
|
# using the given strftime format.
|
||||||
git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local",
|
git_cmd = "git log --pretty=format:'%ad, commit %h' --date=local -n1"
|
||||||
"-n1"]
|
html_last_updated_fmt = os.popen(git_cmd).read()
|
||||||
html_last_updated_fmt = subprocess.Popen(
|
|
||||||
git_cmd, stdout=subprocess.PIPE).communicate()[0]
|
|
||||||
|
|
||||||
# If true, SmartyPants will be used to convert quotes and dashes to
|
# If true, SmartyPants will be used to convert quotes and dashes to
|
||||||
# typographically correct entities.
|
# typographically correct entities.
|
||||||
|
|
|
@ -45,6 +45,14 @@ Ocata specs:
|
||||||
|
|
||||||
specs/ocata/approved/*
|
specs/ocata/approved/*
|
||||||
|
|
||||||
|
Pike specs:
|
||||||
|
|
||||||
|
.. toctree::
|
||||||
|
:glob:
|
||||||
|
:maxdepth: 1
|
||||||
|
|
||||||
|
specs/pike/approved/*
|
||||||
|
|
||||||
==========================
|
==========================
|
||||||
Murano apps Specifications
|
Murano apps Specifications
|
||||||
==========================
|
==========================
|
||||||
|
|
|
@ -2,8 +2,9 @@
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
|
|
||||||
pbr>=0.6,!=0.7,<1.0
|
pbr>=2.0.0,!=2.1.0 # Apache-2.0
|
||||||
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
|
oslosphinx>=4.7.0 # Apache-2.0
|
||||||
testrepository>=0.0.18
|
sphinx>=1.5.1 # BSD
|
||||||
testtools>=0.9.34
|
testrepository>=0.0.18 # Apache-2.0/BSD
|
||||||
yasfb
|
testtools>=1.4.0 # MIT
|
||||||
|
yasfb>=0.5.1,!=0.6.0
|
||||||
|
|
|
@ -12,6 +12,7 @@ classifier =
|
||||||
Operating System :: POSIX :: Linux
|
Operating System :: POSIX :: Linux
|
||||||
|
|
||||||
[build_sphinx]
|
[build_sphinx]
|
||||||
|
builders = html
|
||||||
all_files = 1
|
all_files = 1
|
||||||
build-dir = doc/build
|
build-dir = doc/build
|
||||||
source-dir = doc/source
|
source-dir = doc/source
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -18,5 +18,5 @@
|
||||||
import setuptools
|
import setuptools
|
||||||
|
|
||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
setup_requires=['pbr'],
|
setup_requires=['pbr>=2.0'],
|
||||||
pbr=True)
|
pbr=True)
|
||||||
|
|
5
tox.ini
5
tox.ini
|
@ -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}
|
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
|
deps = -r{toxinidir}/requirements.txt
|
||||||
commands = python setup.py testr --slowest --testr-args='{posargs}'
|
commands = python setup.py testr --slowest --testr-args='{posargs}'
|
||||||
|
whitelist_externals = find
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
commands = python setup.py build_sphinx
|
commands =
|
||||||
|
find . -type f -name "*.pyc" -delete
|
||||||
|
python setup.py build_sphinx
|
||||||
|
|
||||||
[testenv:doc8]
|
[testenv:doc8]
|
||||||
deps =
|
deps =
|
||||||
|
|
Loading…
Reference in New Issue