#1053: remove unittest2 and mock==1.0.1 deps

.ci/travis/install.sh

@@ -41,9 +41,7 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
     pyenv activate psutil
 fi
 
-if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]] || [[ $PYVER == 'py26' ]]; then
-    pip install -U ipaddress unittest2 argparse mock==1.0.1
-elif [[ $TRAVIS_PYTHON_VERSION == '2.7' ]] || [[ $PYVER == 'py27' ]]; then
+if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]] || [[ $PYVER == 'py27' ]]; then
     pip install -U ipaddress mock
 elif [[ $TRAVIS_PYTHON_VERSION == '3.2' ]] || [[ $PYVER == 'py32' ]]; then
     pip install -U ipaddress mock

DEVGUIDE.rst

@@ -40,7 +40,7 @@ Makefile
 Some useful make commands::
 
   $ make install        # install
-  $ make setup-dev-env  # install useful dev libs (pyflakes, unittest2, etc.)
+  $ make setup-dev-env  # install useful dev libs (pyflakes, mock, etc.)
   $ make test           # run unit tests
   $ make test-memleaks  # run memory leak tests
   $ make coverage       # run test coverage

Makefile

@@ -14,15 +14,14 @@ DEPS = \
 	flake8 \
 	futures \
 	ipaddress \
-	mock==1.0.1 \
+	mock \
 	pep8 \
 	perf \
 	pyflakes \
 	requests \
 	setuptools \
 	sphinx \
 	twine \
-	unittest2 \
 	requests
 
 # In not in a virtualenv, add --user options for install commands.

appveyor.yml

@@ -78,13 +78,11 @@ install:
   - "powershell .ci\\appveyor\\install.ps1"
   # - ps: (new-object net.webclient).DownloadFile('https://raw.github.com/pypa/pip/master/contrib/get-pip.py', 'C:/get-pip.py')
   - "%WITH_COMPILER% %PYTHON%/python.exe -m pip --version"
-  - "%WITH_COMPILER% %PYTHON%/python.exe -m pip install --upgrade --user unittest2 ipaddress pypiwin32 wmi wheel"
   - "%WITH_COMPILER% %PYTHON%/python.exe -m pip freeze"
   - "%WITH_COMPILER% %PYTHON%/python.exe setup.py build"
   - "%WITH_COMPILER% %PYTHON%/python.exe setup.py build build_ext -i"
   - "%WITH_COMPILER% %PYTHON%/python.exe setup.py develop"
-  # 1.0.1 is the latest release supporting python 2.6
-  - "%WITH_COMPILER% %PYTHON%/Scripts/pip.exe install mock==1.0.1"
+  - "%WITH_COMPILER% %PYTHON%/Scripts/pip.exe install mock"
 
 build: off
 

psutil/tests/__init__.py

@@ -26,6 +26,7 @@
 import textwrap
 import threading
 import time
+import unittest
 import warnings
 from socket import AF_INET
 from socket import AF_INET6
@@ -41,11 +42,6 @@
 from psutil._compat import unicode
 from psutil._compat import which
 
-if sys.version_info < (2, 7):
-    import unittest2 as unittest  # requires "pip install unittest2"
-else:
-    import unittest
-
 try:
     from unittest import mock  # py3
 except ImportError:

psutil/tests/__main__.py

@@ -16,12 +16,12 @@
 import ssl
 import sys
 import tempfile
+import unittest
 try:
     from urllib.request import urlopen  # py3
 except ImportError:
     from urllib2 import urlopen
 
-from psutil.tests import unittest
 from psutil.tests import VERBOSITY
 
 

psutil/tests/test_bsd.py

@@ -14,6 +14,7 @@
 import os
 import re
 import time
+import unittest
 
 import psutil
 from psutil import BSD
@@ -26,7 +27,6 @@
 from psutil.tests import retry_before_failing
 from psutil.tests import run_test_module_by_name
 from psutil.tests import sh
-from psutil.tests import unittest
 from psutil.tests import which
 
 

psutil/tests/test_connections.py

@@ -9,6 +9,7 @@
 import os
 import socket
 import textwrap
+import unittest
 from contextlib import closing
 from socket import AF_INET
 from socket import AF_INET6
@@ -39,7 +40,6 @@
 from psutil.tests import skip_on_access_denied
 from psutil.tests import tcp_socketpair
 from psutil.tests import TESTFN
-from psutil.tests import unittest
 from psutil.tests import unix_socket_path
 from psutil.tests import unix_socketpair
 from psutil.tests import wait_for_file

psutil/tests/test_contracts.py

@@ -14,6 +14,7 @@
 import stat
 import time
 import traceback
+import unittest
 from contextlib import closing
 
 from psutil import BSD
@@ -38,7 +39,6 @@
 from psutil.tests import safe_rmpath
 from psutil.tests import skip_on_access_denied
 from psutil.tests import TESTFN
-from psutil.tests import unittest
 from psutil.tests import unix_socket_path
 from psutil.tests import VALID_PROC_STATUSES
 from psutil.tests import warn

psutil/tests/test_linux.py

@@ -21,6 +21,7 @@
 import tempfile
 import textwrap
 import time
+import unittest
 import warnings
 
 import psutil
@@ -44,7 +45,6 @@
 from psutil.tests import TESTFN
 from psutil.tests import ThreadTask
 from psutil.tests import TRAVIS
-from psutil.tests import unittest
 from psutil.tests import which
 
 

psutil/tests/test_memory_leaks.py

@@ -19,6 +19,7 @@
 import os
 import threading
 import time
+import unittest
 
 import psutil
 import psutil._common
@@ -46,7 +47,6 @@
 from psutil.tests import safe_rmpath
 from psutil.tests import TESTFN
 from psutil.tests import TRAVIS
-from psutil.tests import unittest
 
 
 LOOPS = 1000

psutil/tests/test_misc.py

@@ -20,6 +20,7 @@
 import socket
 import stat
 import sys
+import unittest
 
 from psutil import LINUX
 from psutil import POSIX
@@ -57,7 +58,6 @@
 from psutil.tests import TESTFN
 from psutil.tests import TOX
 from psutil.tests import TRAVIS
-from psutil.tests import unittest
 from psutil.tests import unix_socket_path
 from psutil.tests import unix_socketpair
 from psutil.tests import wait_for_file

psutil/tests/test_osx.py

@@ -9,6 +9,7 @@
 import os
 import re
 import time
+import unittest
 
 import psutil
 from psutil import OSX
@@ -18,7 +19,6 @@
 from psutil.tests import retry_before_failing
 from psutil.tests import run_test_module_by_name
 from psutil.tests import sh
-from psutil.tests import unittest
 
 
 PAGESIZE = os.sysconf("SC_PAGE_SIZE") if OSX else None

psutil/tests/test_posix.py

@@ -13,6 +13,7 @@
 import subprocess
 import sys
 import time
+import unittest
 
 import psutil
 from psutil import BSD
@@ -34,7 +35,6 @@
 from psutil.tests import sh
 from psutil.tests import skip_on_access_denied
 from psutil.tests import TRAVIS
-from psutil.tests import unittest
 from psutil.tests import wait_for_pid
 
 

psutil/tests/test_process.py

@@ -20,6 +20,7 @@
 import textwrap
 import time
 import types
+import unittest
 
 import psutil
 
@@ -65,7 +66,6 @@
 from psutil.tests import ThreadTask
 from psutil.tests import TOX
 from psutil.tests import TRAVIS
-from psutil.tests import unittest
 from psutil.tests import wait_for_pid
 from psutil.tests import WIN_VISTA
 

psutil/tests/test_sunos.py

@@ -7,12 +7,12 @@
 """Sun OS specific tests."""
 
 import os
+import unittest
 
 import psutil
 from psutil import SUNOS
 from psutil.tests import run_test_module_by_name
 from psutil.tests import sh
-from psutil.tests import unittest
 
 
 @unittest.skipIf(not SUNOS, "SUNOS only")

psutil/tests/test_system.py

@@ -17,6 +17,7 @@
 import sys
 import tempfile
 import time
+import unittest
 
 import psutil
 from psutil import BSD
@@ -48,7 +49,6 @@
 from psutil.tests import TESTFN
 from psutil.tests import TESTFN_UNICODE
 from psutil.tests import TRAVIS
-from psutil.tests import unittest
 
 
 # ===================================================================

psutil/tests/test_unicode.py

@@ -53,6 +53,7 @@
 """
 
 import os
+import unittest
 from contextlib import closing
 
 from psutil import BSD
@@ -79,7 +80,6 @@
 from psutil.tests import TESTFN
 from psutil.tests import TESTFN_UNICODE
 from psutil.tests import TRAVIS
-from psutil.tests import unittest
 from psutil.tests import unix_socket_path
 import psutil
 import psutil.tests

psutil/tests/test_windows.py

@@ -16,6 +16,7 @@
 import subprocess
 import sys
 import time
+import unittest
 
 try:
     import win32api  # requires "pip install pypiwin32" / "make setup-dev-env"
@@ -37,7 +38,6 @@
 from psutil.tests import retry_before_failing
 from psutil.tests import run_test_module_by_name
 from psutil.tests import sh
-from psutil.tests import unittest
 
 
 cext = psutil._psplatform.cext

scripts/internal/winmake.py

@@ -40,7 +40,6 @@
     "pypiwin32",
     "pyreadline",
     "setuptools",
-    "unittest2",
     "wheel",
     "wmi",
     "requests"

setup.py

@@ -270,7 +270,7 @@ def main():
         packages=packages,
         ext_modules=extensions,
         test_suite="psutil.tests.get_suite",
-        tests_require=['ipaddress', 'mock', 'unittest2'],
+        tests_require=['ipaddress', 'mock'],
         zip_safe=False,   # http://stackoverflow.com/questions/19548957
         # see: python setup.py register --list-classifiers
         classifiers=[

tox.ini

@@ -5,14 +5,11 @@
 # directory.
 
 [tox]
-envlist = py26, py27, py32, py33, py34
+envlist = py27, py32, py33, py34, py35, py36
 
 [testenv]
 deps =
     flake8
-    py26: ipaddress
-    py26: mock==1.0.1
-    py26: unittest2
     py27: ipaddress
     py27: mock
     py32: ipaddress