Merge pull request #563 from swamper123/Drop_Python2_support_in_travis

Drop python2 support in travis

Author: dhoomakethu

.travis.yml

@@ -3,28 +3,30 @@ language: python
 matrix:
   include:
   - os: linux
-    python: "2.7"
-  - os: linux
+    dist: bionic
     python: "3.6"
   - os: linux
+    dist: bionic
     python: "3.7"
   - os: linux
+    dist: bionic
     python: "3.8"
+  - os: linux
+    dist: bionic
+    python: "3.9-dev"
   - os: osx
-    osx_image: xcode8.3
+    osx_image: xcode12.2
     language: generic
-before_install:
-  - if [ $TRAVIS_OS_NAME = osx ]; then brew update; fi
-  - if [ $TRAVIS_OS_NAME = osx ]; then brew install openssl; fi
-#  - if [$TRAVIS_OS_NAME = osx ]; then  python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"; fi
-
+    before_install:
+        - brew install python@3.9
+        - pip3 install virtualenv
 install:
 #  - scripts/travis.sh pip install pip-accel
-  - if [ $TRAVIS_OS_NAME = osx ]; then scripts/travis.sh pip install -U "\"setuptools<45"\"; else pip install -U setuptools --upgrade ; fi
-  - scripts/travis.sh pip install coveralls
-  - scripts/travis.sh pip install --requirement=requirements-checks.txt
-  - scripts/travis.sh pip install --requirement=requirements-tests.txt
-  - scripts/travis.sh LC_ALL=C pip install .
+  - pip3 install -U setuptools --upgrade
+  - scripts/travis.sh pip3 install coveralls
+  - scripts/travis.sh pip3 install --requirement=requirements-checks.txt
+  - scripts/travis.sh pip3 install --requirement=requirements-tests.txt
+  - scripts/travis.sh LC_ALL=C pip3 install .
 script:
 #  - scripts/travis.sh make check
   - scripts/travis.sh make test

scripts/travis.sh

@@ -1,10 +1,8 @@
 #!/bin/bash -e
 set -x
 if [ "$TRAVIS_OS_NAME" = osx ]; then
-  VIRTUAL_ENV="$HOME/.virtualenvs/python2.7"
-  if [ ! -x "$VIRTUAL_ENV/bin/python" ]; then
-    virtualenv "$VIRTUAL_ENV"
-  fi
+  VIRTUAL_ENV="$HOME/.virtualenvs/python3"
+  virtualenv "$VIRTUAL_ENV"
   source "$VIRTUAL_ENV/bin/activate"
 fi
 

test/test_client_async.py

@@ -32,8 +32,8 @@
 IS_DARWIN = platform.system().lower() == "darwin"
 OSX_SIERRA = LooseVersion("10.12")
 if IS_DARWIN:
-    IS_HIGH_SIERRA_OR_ABOVE = LooseVersion(platform.mac_ver()[0])
-    SERIAL_PORT = '/dev/ttyp0' if not IS_HIGH_SIERRA_OR_ABOVE else '/dev/ptyp0'
+    IS_HIGH_SIERRA_OR_ABOVE = OSX_SIERRA < LooseVersion(platform.mac_ver()[0])
+    SERIAL_PORT = '/dev/ptyp0' if not IS_HIGH_SIERRA_OR_ABOVE else '/dev/ttyp0'
 else:
     IS_HIGH_SIERRA_OR_ABOVE = False
     SERIAL_PORT = "/dev/ptmx"

test/test_client_async_tornado.py

@@ -24,8 +24,8 @@
 IS_DARWIN = platform.system().lower() == "darwin"
 OSX_SIERRA = LooseVersion("10.12")
 if IS_DARWIN:
-    IS_HIGH_SIERRA_OR_ABOVE = LooseVersion(platform.mac_ver()[0])
-    SERIAL_PORT = '/dev/ttyp0' if not IS_HIGH_SIERRA_OR_ABOVE else '/dev/ptyp0'
+    IS_HIGH_SIERRA_OR_ABOVE = OSX_SIERRA < LooseVersion(platform.mac_ver()[0])
+    SERIAL_PORT = '/dev/ptyp0' if not IS_HIGH_SIERRA_OR_ABOVE else '/dev/ttyp0'
 else:
     IS_HIGH_SIERRA_OR_ABOVE = False
     SERIAL_PORT = "/dev/ptmx"

test/test_server_async.py

@@ -26,7 +26,7 @@
 IS_DARWIN = platform.system().lower() == "darwin"
 OSX_SIERRA = LooseVersion("10.12")
 if IS_DARWIN:
-    IS_HIGH_SIERRA_OR_ABOVE = LooseVersion(platform.mac_ver()[0])
+    IS_HIGH_SIERRA_OR_ABOVE = OSX_SIERRA < LooseVersion(platform.mac_ver()[0])
     SERIAL_PORT = '/dev/ptyp0' if not IS_HIGH_SIERRA_OR_ABOVE else '/dev/ttyp0'
 else:
     IS_HIGH_SIERRA_OR_ABOVE = False

test/test_server_asyncio.py

@@ -33,7 +33,7 @@
 IS_DARWIN = platform.system().lower() == "darwin"
 OSX_SIERRA = LooseVersion("10.12")
 if IS_DARWIN:
-    IS_HIGH_SIERRA_OR_ABOVE = LooseVersion(platform.mac_ver()[0])
+    IS_HIGH_SIERRA_OR_ABOVE = OSX_SIERRA < LooseVersion(platform.mac_ver()[0])
     SERIAL_PORT = '/dev/ptyp0' if not IS_HIGH_SIERRA_OR_ABOVE else '/dev/ttyp0'
 else:
     IS_HIGH_SIERRA_OR_ABOVE = False

test/test_server_sync.py

@@ -28,7 +28,7 @@
 IS_DARWIN = platform.system().lower() == "darwin"
 OSX_SIERRA = LooseVersion("10.12")
 if IS_DARWIN:
-    IS_HIGH_SIERRA_OR_ABOVE = LooseVersion(platform.mac_ver()[0])
+    IS_HIGH_SIERRA_OR_ABOVE = OSX_SIERRA < LooseVersion(platform.mac_ver()[0])
     SERIAL_PORT = '/dev/ptyp0' if not IS_HIGH_SIERRA_OR_ABOVE else '/dev/ttyp0'
 else:
     IS_HIGH_SIERRA_OR_ABOVE = False

tox.ini

@@ -4,7 +4,7 @@
 # directory.
 
 [tox]
-envlist = py27, py35, py36, py37, pypy
+envlist = py36, py37, py38, pypy3
 
 [testenv]
 deps = -r requirements-tests.txt