aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--requirements.txt4
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini4
-rw-r--r--xtesting/ci/tier_handler.py3
4 files changed, 7 insertions, 6 deletions
diff --git a/requirements.txt b/requirements.txt
index 02b36559..225ab01f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,8 +2,8 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
pbr!=2.1.0,>=2.0.0 # Apache-2.0
-stevedore>=1.20.0 # Apache-2.0
-PyYAML>=3.12 # MIT
+stevedore>=1.20.0 # Apache-2.0
+PyYAML>=3.10 # MIT
enum34>=1.0.4;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD
requests>=2.14.2 # Apache-2.0
robotframework>=3.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 9fd35148..2beb3606 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,7 @@ mock>=2.0.0 # BSD
nose>=1.3.7 # LGPL
flake8<2.6.0,>=2.5.4 # MIT
pylint==1.4.5 # GPLv2
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinx!=1.6.6,>=1.6.2 # BSD
sphinx-rtd-theme
yamllint
doc8>=0.6.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 98df801f..1c42b1e8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = docs,pep8,pylint,yamllint,bashate,py35,py27,perm,cover
+envlist = docs,pep8,pylint,yamllint,bashate,py27,perm,cover
skipsdist = True
[testenv]
@@ -41,7 +41,7 @@ files =
commands =
yamllint -s {[testenv:yamllint]files}
-[testenv:py35]
+[testenv:py36]
commands = nosetests xtesting/tests/unit
[testenv:bashate]
diff --git a/xtesting/ci/tier_handler.py b/xtesting/ci/tier_handler.py
index ce9685be..4b74e37c 100644
--- a/xtesting/ci/tier_handler.py
+++ b/xtesting/ci/tier_handler.py
@@ -7,8 +7,9 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
+# pylint: disable=missing-docstring,too-many-instance-attributes
+
"""Tier and TestCase classes to wrap the testcases config file"""
-# pylint: disable=missing-docstring
import textwrap