summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. Blair <jeblair@redhat.com>2017-07-31 13:56:44 -0700
committerJames E. Blair <jeblair@redhat.com>2017-07-31 14:00:10 -0700
commit4eaed1f5858e6ccfd6d8ae0233cdfa4b39593756 (patch)
treec97c81ceb45ec25810699ed07ef04afaa6c721b3
parent7342ef9e801d9607a294ef1d71806b73f5706d93 (diff)
Fix package setup0.1.1
Sphinx and pbr are run-time requirements of this package. Remove dep on oslosphinx. Tell pbr our package name. Change-Id: Ia23cb2845b4d482888637728ac7712358e5e3629
Notes
Notes (review): Code-Review+2: Paul Belanger <pabelanger@redhat.com> Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 31 Jul 2017 21:06:16 +0000 Reviewed-on: https://review.openstack.org/489395 Project: openstack-infra/zuul-sphinx Branch: refs/heads/master
-rw-r--r--.gitignore1
-rwxr-xr-xdoc/source/conf.py1
-rw-r--r--requirements.txt3
-rw-r--r--setup.cfg4
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini3
6 files changed, 10 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 58948d4..745621d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
1*.pyc 1*.pyc
2*~ 2*~
3*.egg-info/
3 4
4# Unit test / coverage reports 5# Unit test / coverage reports
5.coverage 6.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 = [
24 'sphinx.ext.autodoc', 24 'sphinx.ext.autodoc',
25 #'sphinx.ext.intersphinx', 25 #'sphinx.ext.intersphinx',
26 'zuul_sphinx.zuul', 26 'zuul_sphinx.zuul',
27 'oslosphinx'
28] 27]
29 28
30# autodoc generation is a bit aggressive and a nuisance when doing heavy 29# 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 @@
1pbr>=1.1.0
2sphinx>=1.5.1,<1.6.0 # BSD
3pyyaml
diff --git a/setup.cfg b/setup.cfg
index fd2681f..5a03c8f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,6 +14,10 @@ classifier =
14 Operating System :: POSIX :: Linux 14 Operating System :: POSIX :: Linux
15 Programming Language :: Python 15 Programming Language :: Python
16 16
17[files]
18packages =
19 zuul_sphinx
20
17[build_sphinx] 21[build_sphinx]
18all-files = 1 22all-files = 1
19warning-is-error = 1 23warning-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 @@
5hacking>=0.12.0,<0.13 # Apache-2.0 5hacking>=0.12.0,<0.13 # Apache-2.0
6 6
7bashate>=0.2 7bashate>=0.2
8sphinx>=1.5.1,<1.6.0 # BSD
9oslosphinx>=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
5 5
6[testenv] 6[testenv]
7install_command = pip install {opts} {packages} 7install_command = pip install {opts} {packages}
8deps = -r{toxinidir}/test-requirements.txt 8deps = -r{toxinidir}/requirements.txt
9 -r{toxinidir}/test-requirements.txt
9commands = 10commands =
10 python setup.py testr --slowest --testr-args='{posargs}' 11 python setup.py testr --slowest --testr-args='{posargs}'
11 12