From 4eaed1f5858e6ccfd6d8ae0233cdfa4b39593756 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Mon, 31 Jul 2017 13:56:44 -0700
Subject: [PATCH] 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 +
 doc/source/conf.py    | 1 -
 requirements.txt      | 3 +++
 setup.cfg             | 4 ++++
 test-requirements.txt | 2 --
 tox.ini               | 3 ++-
 6 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 requirements.txt

diff --git a/.gitignore b/.gitignore
index 58948d4..745621d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.pyc
 *~
+*.egg-info/
 
 # Unit test / coverage reports
 .coverage
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 1c0114c..717e639 100755
--- a/doc/source/conf.py
+++ b/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
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..8abd148
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,3 @@
+pbr>=1.1.0
+sphinx>=1.5.1,<1.6.0 # BSD
+pyyaml
diff --git a/setup.cfg b/setup.cfg
index fd2681f..5a03c8f 100644
--- a/setup.cfg
+++ b/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
diff --git a/test-requirements.txt b/test-requirements.txt
index d6676fe..8285871 100644
--- a/test-requirements.txt
+++ b/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
diff --git a/tox.ini b/tox.ini
index 723d6a3..872157f 100644
--- a/tox.ini
+++ b/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}'