From 6141ad62ac0ed26520427dedc6609df88d2a938f Mon Sep 17 00:00:00 2001
From: Shu Muto <shu-mutou@rf.jp.nec.com>
Date: Fri, 27 Oct 2017 17:02:18 +0900
Subject: [PATCH] Cleanup tox and requirements

Remove unnecessary requirements and exclusions for flake8.

Change-Id: I80a41847cae36eb66dd6ce621a10ba273d8ec276
---
 requirements.txt      |  7 -------
 test-requirements.txt | 18 ++++++------------
 tox.ini               | 10 ++--------
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 41b0deb..8d97c5a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,11 +8,4 @@
 #
 # PBR should always appear first
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
-# If python-zunclient will be released, we will use it.
 python-zunclient>=0.2.0 # Apache-2.0
-Babel!=2.4.0,>=2.3.4 # BSD
-Django<2.0,>=1.8 # BSD
-django-babel>=0.5.1 # BSD
-django-compressor>=2.0 # MIT
-django-openstack-auth>=3.5.0 # Apache-2.0
-django-pyscss>=2.0.2 # BSD License (2 clause)
diff --git a/test-requirements.txt b/test-requirements.txt
index fc2b7c4..0544322 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,23 +8,17 @@
 #
 # Hacking should appear first in case something else depends on pep8
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
-#
+
 coverage!=4.4,>=4.0 # Apache-2.0
 django-nose>=1.4.4 # BSD
 mock>=2.0.0 # BSD
 mox3>=0.20.0 # Apache-2.0
-nodeenv>=0.9.4 # BSD
-nose>=1.3.7 # LGPL
-nose-exclude>=0.3.0 # LGPL
-nosehtmloutput>=0.0.3 # Apache-2.0
-nosexcover>=1.0.10 # BSD
-openstack.nose-plugin>=0.7 # Apache-2.0
+testtools>=1.4.0 # MIT
+
+# For docs
+sphinx>=1.6.2 # BSD
 openstackdocstheme>=1.17.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
-selenium>=2.50.1 # Apache-2.0
-sphinx>=1.6.2 # BSD
-testtools>=1.4.0 # MIT
-# This also needs xvfb library installed on your OS
-xvfbwrapper>=0.1.3 #license: MIT
+
 # Include horizon as test requirement
 http://tarballs.openstack.org/horizon/horizon-master.tar.gz#egg=horizon
diff --git a/tox.ini b/tox.ini
index 7141733..c270a8c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pep8,py35,py27,py27dj18
+envlist = pep8,py35,py27
 minversion = 2.3.2
 skipsdist = True
 
@@ -26,12 +26,6 @@ commands = {posargs}
 [testenv:cover]
 commands = python setup.py test --coverage --testr-args='{posargs}'
 
-[testenv:py27dj18]
-basepython = python2.7
-commands =
-    pip install django>=1.8,<1.9
-    python manage.py test {posargs} --settings=zun_ui.test.settings
-
 [testenv:docs]
 commands = python setup.py build_sphinx
 
@@ -39,6 +33,6 @@ commands = python setup.py build_sphinx
 commands = sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [flake8]
-exclude = .venv,.git,.tox,dist,*lib/python*,*egg,build,panel_template,dash_template,local_settings.py,*/local/*,*/test/test_plugins/*,.ropeproject,node_modules
+exclude = .venv,.git,.tox,dist,*egg,build,node_modules
 max-complexity = 20