Fix package setup

Sphinx and pbr are run-time requirements of this package.

Remove dep on oslosphinx.

Tell pbr our package name.

Change-Id: Ia23cb2845b4d482888637728ac7712358e5e3629
This commit is contained in:
James E. Blair 2017-07-31 13:56:44 -07:00
parent 7342ef9e80
commit 4eaed1f585
6 changed files with 10 additions and 4 deletions

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
*.pyc *.pyc
*~ *~
*.egg-info/
# Unit test / coverage reports # Unit test / coverage reports
.coverage .coverage

View File

@ -24,7 +24,6 @@ extensions = [
'sphinx.ext.autodoc', 'sphinx.ext.autodoc',
#'sphinx.ext.intersphinx', #'sphinx.ext.intersphinx',
'zuul_sphinx.zuul', 'zuul_sphinx.zuul',
'oslosphinx'
] ]
# autodoc generation is a bit aggressive and a nuisance when doing heavy # autodoc generation is a bit aggressive and a nuisance when doing heavy

3
requirements.txt Normal file
View File

@ -0,0 +1,3 @@
pbr>=1.1.0
sphinx>=1.5.1,<1.6.0 # BSD
pyyaml

View File

@ -14,6 +14,10 @@ classifier =
Operating System :: POSIX :: Linux Operating System :: POSIX :: Linux
Programming Language :: Python Programming Language :: Python
[files]
packages =
zuul_sphinx
[build_sphinx] [build_sphinx]
all-files = 1 all-files = 1
warning-is-error = 1 warning-is-error = 1

View File

@ -5,5 +5,3 @@
hacking>=0.12.0,<0.13 # Apache-2.0 hacking>=0.12.0,<0.13 # Apache-2.0
bashate>=0.2 bashate>=0.2
sphinx>=1.5.1,<1.6.0 # BSD
oslosphinx>=4.7.0 # Apache-2.0

View File

@ -5,7 +5,8 @@ envlist = pep8
[testenv] [testenv]
install_command = pip install {opts} {packages} install_command = pip install {opts} {packages}
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = commands =
python setup.py testr --slowest --testr-args='{posargs}' python setup.py testr --slowest --testr-args='{posargs}'