Make sure that new enough psutil/six is installed

terminalmage · terminalmage · commit 65d039e7f9d2 · 2017-12-06T00:15:25.000-06:00
Also make sure salt-testing is present on a couple ones that were
missing it.
diff --git a/arch/dev_python27.txt b/arch/dev_python27.txt
@@ -6,7 +6,8 @@ boto>=2.32.1
 boto3>=1.2.1
 moto>=0.3.6
 SaltTesting
-psutil
+psutil>=4.2.0
+six>=1.10.0
 SaltPyLint>=v2017.3.6
 pytest
 git+https://github.com/eisensheng/pytest-catchlog.git@develop#egg=Pytest-catchlog
diff --git a/cent5/dev_python27.txt b/cent5/dev_python27.txt
@@ -7,7 +7,8 @@ boto3>=1.2.1
 moto>=0.3.6
 SaltTesting
 pyopenssl
-psutil
+psutil>=4.2.0
+six>=1.10.0
 SaltPyLint>=v2017.3.6
 pytest
 git+https://github.com/eisensheng/pytest-catchlog.git@develop#egg=Pytest-catchlog
diff --git a/cent6/dev_python27.txt b/cent6/dev_python27.txt
@@ -5,6 +5,9 @@ apache-libcloud>=0.14.0
 boto>=2.32.1
 boto3>=1.2.1
 moto>=0.3.6
+SaltTesting
+psutil>=4.2.0
+six>=1.10.0
 SaltPyLint>=v2017.3.6
 pytest
 git+https://github.com/eisensheng/pytest-catchlog.git@develop#egg=Pytest-catchlog
diff --git a/cent7/dev_python27.txt b/cent7/dev_python27.txt
@@ -6,7 +6,8 @@ boto>=2.32.1
 boto3>=1.2.1
 moto>=0.3.6
 SaltTesting
-psutil
+psutil>=4.2.0
+six>=1.10.0
 SaltPyLint>=v2017.3.6
 pytest
 git+https://github.com/eisensheng/pytest-catchlog.git@develop#egg=Pytest-catchlog
diff --git a/debian7/dev_python27.txt b/debian7/dev_python27.txt
@@ -6,7 +6,8 @@ boto>=2.32.1
 boto3>=1.2.1
 moto>=0.3.6
 SaltTesting
-psutil
+psutil>=4.2.0
+six>=1.10.0
 SaltPyLint>=v2017.3.6
 pytest
 git+https://github.com/eisensheng/pytest-catchlog.git@develop#egg=Pytest-catchlog
diff --git a/debian8/dev_python27.txt b/debian8/dev_python27.txt
@@ -6,7 +6,8 @@ boto>=2.32.1
 boto3>=1.2.1
 moto>=0.3.6
 SaltTesting
-psutil
+psutil>=4.2.0
+six>=1.10.0
 SaltPyLint>=v2017.3.6
 pytest
 git+https://github.com/eisensheng/pytest-catchlog.git@develop#egg=Pytest-catchlog
diff --git a/debian9/dev_python27.txt b/debian9/dev_python27.txt
@@ -6,7 +6,8 @@ boto>=2.32.1
 boto3>=1.2.1
 moto>=0.3.6
 SaltTesting
-psutil
+psutil>=4.2.0
+six>=1.10.0
 SaltPyLint>=v2017.3.6
 pytest
 git+https://github.com/eisensheng/pytest-catchlog.git@develop#egg=Pytest-catchlog
diff --git a/fedora24/dev_python27.txt b/fedora24/dev_python27.txt
@@ -6,7 +6,8 @@ boto>=2.32.1
 boto3>=1.2.1
 moto>=0.3.6
 SaltTesting
-psutil
+psutil>=4.2.0
+six>=1.10.0
 SaltPyLint>=v2017.3.6
 pytest
 git+https://github.com/eisensheng/pytest-catchlog.git@develop#egg=Pytest-catchlog
diff --git a/fedora25/dev_python27.txt b/fedora25/dev_python27.txt
@@ -6,7 +6,8 @@ boto>=2.32.1
 boto3>=1.2.1
 moto>=0.3.6
 SaltTesting
-psutil
+psutil>=4.2.0
+six>=1.10.0
 SaltPyLint>=v2017.3.6
 pytest
 git+https://github.com/eisensheng/pytest-catchlog.git@develop#egg=Pytest-catchlog
diff --git a/fedora26/dev_python27.txt b/fedora26/dev_python27.txt
@@ -5,6 +5,9 @@ apache-libcloud>=0.14.0
 boto>=2.32.1
 boto3>=1.2.1
 moto>=0.3.6
+SaltTesting
+psutil>=4.2.0
+six>=1.10.0
 SaltPyLint>=v2017.3.6
 pytest
 git+https://github.com/eisensheng/pytest-catchlog.git@develop#egg=Pytest-catchlog
diff --git a/leap421/dev_python27.txt b/leap421/dev_python27.txt
@@ -6,7 +6,8 @@ boto>=2.32.1
 boto3>=1.2.1
 moto>=0.3.6
 SaltTesting
-psutil
+psutil>=4.2.0
+six>=1.10.0
 SaltPyLint>=v2017.3.6
 pytest
 git+https://github.com/eisensheng/pytest-catchlog.git@develop#egg=Pytest-catchlog
diff --git a/leap422/dev_python27.txt b/leap422/dev_python27.txt
@@ -6,7 +6,8 @@ boto>=2.32.1
 boto3>=1.2.1
 moto>=0.3.6
 SaltTesting
-psutil
+psutil>=4.2.0
+six>=1.10.0
 SaltPyLint>=v2017.3.6
 pytest
 git+https://github.com/eisensheng/pytest-catchlog.git@develop#egg=Pytest-catchlog
diff --git a/tumbleweed/dev_python27.txt b/tumbleweed/dev_python27.txt
@@ -6,7 +6,8 @@ boto>=2.32.1
 boto3>=1.2.1
 moto>=0.3.6
 SaltTesting
-psutil
+psutil>=4.2.0
+six>=1.10.0
 SaltPyLint>=v2017.3.6
 pytest
 git+https://github.com/eisensheng/pytest-catchlog.git@develop#egg=Pytest-catchlog
diff --git a/ubuntu12/dev_python27.txt b/ubuntu12/dev_python27.txt
@@ -7,7 +7,8 @@ boto3>=1.2.1
 moto>=0.3.6
 SaltTesting
 pyopenssl
-psutil
+psutil>=4.2.0
+six>=1.10.0
 SaltPyLint>=v2017.3.6
 pytest
 git+https://github.com/eisensheng/pytest-catchlog.git@develop#egg=Pytest-catchlog
diff --git a/ubuntu14/dev_python27.txt b/ubuntu14/dev_python27.txt
@@ -7,7 +7,8 @@ boto3>=1.2.1
 moto>=0.3.6
 SaltTesting
 pyopenssl
-psutil
+psutil>=4.2.0
+six>=1.10.0
 SaltPyLint>=v2017.3.6
 pytest
 git+https://github.com/eisensheng/pytest-catchlog.git@develop#egg=Pytest-catchlog
diff --git a/ubuntu16/dev_python27.txt b/ubuntu16/dev_python27.txt
@@ -6,7 +6,8 @@ boto>=2.32.1
 boto3>=1.2.1
 moto>=0.3.6
 SaltTesting
-psutil
+psutil>=4.2.0
+six>=1.10.0
 SaltPyLint>=v2017.3.6
 pytest
 git+https://github.com/eisensheng/pytest-catchlog.git@develop#egg=Pytest-catchlog
