From a4c49fab02253dcafcfcd849d3238ac91c8443ea Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 23 Aug 2016 17:08:51 +0200
Subject: [PATCH] Remove openstack-doc-tools

openstack-doc-test has been removed from openstack-doc-tools in release
1.0.0. Remove it's usage from this project.

Also, remove doc-test.conf file, it was used by openstack-doc-tools.

Remove checkniceness and checksyntax targets, they are unused and not
needed. Merge doc8 check into pep8 and doc environments (note that
OpenStack CI does not use doc environment, so add it to pep8 as well) as
is custom for lint like jobs. Fix requirements to follow best practices.

Add doc8 to test-requirements to document its usage properly, add sphinx
there as well.

Change-Id: I97b9df8272c4f425ec516dfb84c29d2263c316f8
---
 doc-test.conf         |  2 --
 test-requirements.txt |  2 ++
 tox.ini               | 23 +++--------------------
 3 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 doc-test.conf

diff --git a/doc-test.conf b/doc-test.conf
deleted file mode 100644
index f86cc542..00000000
--- a/doc-test.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[DEFAULT]
-repo_name = solar
diff --git a/test-requirements.txt b/test-requirements.txt
index 5dd93422..a81e9124 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,6 +6,8 @@ pytest-mock
 tox
 pytest-subunit
 os-testr
+doc8  # Apache-2.0
+sphinx
 
 ## for computable inputs
 # temporary disabled
diff --git a/tox.ini b/tox.ini
index 343cd943..0aa78e2c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,43 +5,28 @@ envlist = pep8,py27
 
 [testenv]
 usedevelop = True
+deps = -r{toxinidir}/test-requirements.txt
 install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
 passenv = SOLAR_DB
 
 [testenv:py27]
-deps = -r{toxinidir}/test-requirements.txt
 commands = ostestr
 
 [testenv:pep8]
 basepython=python2
-deps = hacking==0.10.2
 usedevelop = False
 commands =
     flake8 {posargs:solar}
-
-[testenv:checkniceness]
-deps = openstack-doc-tools>=0.30
-       doc8
-commands =
-  openstack-doc-test --check-niceness
-  doc8 doc
-
-[testenv:checksyntax]
-deps = openstack-doc-tools>=0.30
-commands =
-  openstack-doc-test --check-syntax
+    doc8 doc
 
 [testenv:docs]
 basepython=python2
-deps = sphinx
-       {[testenv:checkniceness]deps}
 whitelist_externals = /bin/rm
 commands =
   /bin/rm -rf doc/build
   python setup.py build_sphinx
-  {[testenv:checkniceness]commands}
-  {[testenv:checksyntax]commands}
+  doc8 doc
 
 [doc8]
 # Settings for doc8:
@@ -57,8 +42,6 @@ max-line-length = 80
 ignore = D000
 
 [testenv:venv]
-deps = -r{toxinidir}/requirements.txt
-       sphinx
 commands = {posargs:}
 
 [testenv:cover]