Update for openstack-doc-tools 2.0

With the new release, we can remove some hacks ;)

Change-Id: Ifccb5879e62531495f2c8b470dace294e991ca58

test-requirements.txt

@@ -8,7 +8,7 @@ hacking>=1.1.0,<1.2.0  # Apache-2.0
 
 beautifulsoup4 # MIT
 Jinja2>=2.8 # BSD License (3 clause)
-openstack-doc-tools>=1.10.0 # Apache-2.0
+openstack-doc-tools>=2.0.0 # Apache-2.0
 sphinx>=1.6.2 # BSD
 openstackdocstheme>=1.23.1 # Apache-2.0
 doc8 # Apache-2.0

tox.ini

@@ -63,11 +63,6 @@ commands =
 whitelist_externals = doc-tools-check-languages
 commands =
   doc-tools-check-languages doc-tools-check-languages.conf publish all
-  # Move from publish-docs to publish-docs/html
-  # TODO(AJaeger): Remove once openstack-doc-tools is updated
-  mkdir publish-docs-new
-  mv publish-docs publish-docs-new/html
-  mv publish-docs-new publish-docs
 
 [testenv:generatepot-rst]
 # Generate POT files for translation, needs {posargs} like: