Browse Source

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
James E. Blair 1 year ago
parent
commit
4eaed1f585
6 changed files with 10 additions and 4 deletions
  1. 1
    0
      .gitignore
  2. 0
    1
      doc/source/conf.py
  3. 3
    0
      requirements.txt
  4. 4
    0
      setup.cfg
  5. 0
    2
      test-requirements.txt
  6. 2
    1
      tox.ini

+ 1
- 0
.gitignore View File

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

+ 0
- 1
doc/source/conf.py View File

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

+ 3
- 0
requirements.txt View File

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

+ 4
- 0
setup.cfg View File

@@ -14,6 +14,10 @@ classifier =
14 14
     Operating System :: POSIX :: Linux
15 15
     Programming Language :: Python
16 16
 
17
+[files]
18
+packages =
19
+    zuul_sphinx
20
+
17 21
 [build_sphinx]
18 22
 all-files = 1
19 23
 warning-is-error = 1

+ 0
- 2
test-requirements.txt View File

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

+ 2
- 1
tox.ini View File

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

Loading…
Cancel
Save