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

.gitignore

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

doc/source/conf.py

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

requirements.txt

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

setup.cfg

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

test-requirements.txt

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

tox.ini

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