diff --git a/doc/source/conf.py b/doc/source/conf.py index f717b2b..db7cab9 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -12,16 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os -import sys - -sys.path.insert(0, os.path.abspath('../..')) # -- General configuration ---------------------------------------------------- # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. extensions = [ - 'sphinx.ext.autodoc', 'openstackdocstheme', #'sphinx.ext.intersphinx', ] diff --git a/requirements.txt b/requirements.txt index 4bf8d7b..0af01e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,14 +2,5 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=0.12.0,<0.13 # Apache-2.0 - -coverage>=4.0,!=4.4 # Apache-2.0 -python-subunit>=0.0.18 # Apache-2.0/BSD sphinx>=1.6.2 # BSD -oslotest>=1.10.0 # Apache-2.0 -testrepository>=0.0.18 # Apache-2.0/BSD -testtools>=1.4.0 # MIT -openstackdocstheme>=1.11.0 # Apache-2.0 -# releasenotes -reno>=1.8.0 # Apache-2.0 \ No newline at end of file +openstackdocstheme>=1.31.2 # Apache-2.0 diff --git a/setup.cfg b/setup.cfg index cb611b6..e04502b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -10,17 +10,3 @@ classifier = Intended Audience :: Developers License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux - -[build_sphinx] -all_files = 1 -build-dir = doc/build -source-dir = doc/source - -[pbr] -warnerrors = True - -[wheel] -universal = 1 - -[upload_sphinx] -upload-dir = doc/build/html diff --git a/setup.py b/setup.py index 056c16c..f76858d 100644 --- a/setup.py +++ b/setup.py @@ -13,17 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools -# In python < 2.7.4, a lazy loading of package `pbr` will break -# setuptools if some other modules registered functions in `atexit`. -# solution from: http://bugs.python.org/issue15881#msg170215 -try: - import multiprocessing # noqa -except ImportError: - pass - setuptools.setup( setup_requires=['pbr'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt deleted file mode 100644 index 6fc0397..0000000 --- a/test-requirements.txt +++ /dev/null @@ -1,11 +0,0 @@ -hacking>=0.12.0,<0.13 # Apache-2.0 - -coverage>=4.0,!=4.4 # Apache-2.0 -python-subunit>=0.0.18 # Apache-2.0/BSD -sphinx>=1.6.2 # BSD -oslotest>=1.10.0 # Apache-2.0 -testrepository>=0.0.18 # Apache-2.0/BSD -testtools>=1.4.0 # MIT -openstackdocstheme>=1.11.0 # Apache-2.0 -# releasenotes -reno>=1.8.0 # Apache-2.0 \ No newline at end of file diff --git a/tox.ini b/tox.ini index 71ff9eb..82b8b2d 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,6 @@ skipsdist = True basepython = python3 usedevelop = True setenv = VIRTUAL_ENV={envdir} -install_command = pip install -U {opts} {packages} deps = -r{toxinidir}/requirements.txt commands = python setup.py testr --slowest --testr-args='{posargs}'