Python 2 End-Of-Life

VUnit · Oct 13, 2019 · effda9b · effda9b
1 parent c437255
commit effda9b
Show file tree

Hide file tree

Showing 18 changed files with 4 additions and 45 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -7,8 +7,6 @@ environment:
     # For Python versions available on Appveyor, see
     # http://www.appveyor.com/docs/installed-software#python
 
-    - BUILD_NAME: py27-unit
-      PYTHON: "C:\\Python27"
     - BUILD_NAME: py34-unit
       PYTHON: "C:\\Python34"
     - BUILD_NAME: py35-unit
@@ -18,18 +16,12 @@ environment:
     - BUILD_NAME: py37-unit
       PYTHON: "C:\\Python37"
 
-    - BUILD_NAME: py27-lint
-      PYTHON: "C:\\Python27"
     - BUILD_NAME: py37-lint
       PYTHON: "C:\\Python37"
 
-    - BUILD_NAME: py27-docs
-      PYTHON: "C:\\Python27"
     - BUILD_NAME: py37-docs
       PYTHON: "C:\\Python37"
 
-    - BUILD_NAME: py27-acceptance-ghdl
-      PYTHON: "C:\\Python27"
     - BUILD_NAME: py37-acceptance-ghdl
       PYTHON: "C:\\Python37"
 

diff --git a/.travis.yml b/.travis.yml
@@ -10,18 +10,13 @@ matrix:
   include:
   - &docker
     env:
-      - BUILD_NAME=py27-acceptance-ghdl
-      - DOCKER_IMAGE=mcode-2
+      - BUILD_NAME=py37-acceptance-ghdl
+      - DOCKER_IMAGE=llvm
     services: docker
     language: minimal
     install: skip
     script: docker run --rm -tv $(pwd):/src -w /src vunit/dev:$DOCKER_IMAGE tox -e $BUILD_NAME
 
-  - <<: *docker
-    env:
-      - BUILD_NAME=py37-acceptance-ghdl
-      - DOCKER_IMAGE=llvm
-
   - <<: *docker
     env:
       - BUILD_NAME=py37-vcomponents-ghdl
@@ -33,15 +28,11 @@ matrix:
     script: tox -e $BUILD_NAME -- --check
 
 
-  - env: BUILD_NAME=py27-lint
-    python: '2.7'
   - env: BUILD_NAME=py37-lint
     dist: xenial
     python: '3.7'
 
 
-  - env: BUILD_NAME=py27-unit
-    python: '2.7'
   - env: BUILD_NAME=py34-unit
     python: '3.4'
   - env: BUILD_NAME=py35-unit
@@ -53,9 +44,6 @@ matrix:
     python: '3.7'
 
 
-  - env: BUILD_NAME=py27-docs
-    python: '2.7'
-    before_script: git fetch --unshallow --tags
   - env: BUILD_NAME=py36-docs
     python: '3.6'
     before_script: git fetch --unshallow --tags
@@ -72,6 +60,7 @@ matrix:
         repo: VUnit/vunit
         branch: master
 
+
   # Deploy to PyPI whenever the package version has changed
   # When a package version has not changed a new upload will not be triggered
   - stage: deploy

diff --git a/vunit/activehdl_interface.py b/vunit/activehdl_interface.py
@@ -9,8 +9,6 @@
 """
 
 
-from __future__ import print_function
-
 from os.path import join, dirname, abspath
 import os
 import re

diff --git a/vunit/ghdl_interface.py b/vunit/ghdl_interface.py
@@ -8,7 +8,6 @@
 Interface for GHDL simulator
 """
 
-from __future__ import print_function
 import logging
 from os.path import exists, join, abspath
 import os

diff --git a/vunit/incisive_interface.py b/vunit/incisive_interface.py
@@ -8,7 +8,6 @@
 Interface for the Cadence Incisive simulator
 """
 
-from __future__ import print_function
 import os
 from os.path import join, dirname, abspath, relpath
 import subprocess

diff --git a/vunit/modelsim_interface.py b/vunit/modelsim_interface.py
@@ -9,8 +9,6 @@
 """
 
 
-from __future__ import print_function
-
 import logging
 import sys
 import io

diff --git a/vunit/ostools.py b/vunit/ostools.py
@@ -10,8 +10,6 @@
 """
 
 
-from __future__ import print_function
-
 import time
 import subprocess
 import threading

diff --git a/vunit/parsing/verilog/tokenizer.py b/vunit/parsing/verilog/tokenizer.py
@@ -12,7 +12,6 @@
 Verilog preprocessing
 """
 
-from __future__ import print_function
 from vunit.parsing.tokenizer import Tokenizer, Token
 from vunit.parsing.verilog.tokens import *
 

diff --git a/vunit/persistent_tcl_shell.py b/vunit/persistent_tcl_shell.py
@@ -8,7 +8,6 @@
 A persistent TCL shell to avoid startup overhead in TCL-based simulators
 """
 
-from __future__ import print_function
 import threading
 import logging
 from vunit.ostools import Process

diff --git a/vunit/rivierapro_interface.py b/vunit/rivierapro_interface.py
@@ -9,8 +9,6 @@
 """
 
 
-from __future__ import print_function
-
 from os.path import join, dirname, abspath
 import os
 import re

diff --git a/vunit/simulator_interface.py b/vunit/simulator_interface.py
@@ -8,7 +8,6 @@
 Generic simulator interface
 """
 
-from __future__ import print_function
 import sys
 import os
 import subprocess

diff --git a/vunit/test/lint/test_license.py b/vunit/test/lint/test_license.py
@@ -7,7 +7,7 @@
 """
 License header sanity check
 """
-from __future__ import print_function
+
 
 import unittest
 from warnings import simplefilter, catch_warnings

diff --git a/vunit/test/unit/test_test_runner.py b/vunit/test/unit/test_test_runner.py
@@ -9,8 +9,6 @@
 """
 
 
-from __future__ import print_function
-
 import unittest
 from os.path import join, abspath
 

diff --git a/vunit/test/unit/test_ui.py b/vunit/test/unit/test_ui.py
@@ -10,7 +10,6 @@
 Acceptance test of the VUnit public interface class
 """
 
-from __future__ import print_function
 import unittest
 from string import Template
 import os

diff --git a/vunit/test_runner.py b/vunit/test_runner.py
@@ -9,8 +9,6 @@
 """
 
 
-from __future__ import print_function
-
 import os
 from os.path import join, exists, abspath, basename, relpath
 import traceback

diff --git a/vunit/ui.py b/vunit/ui.py
@@ -256,8 +256,6 @@
 """
 
 
-from __future__ import print_function
-
 import csv
 import sys
 import traceback

diff --git a/vunit/version_check.py b/vunit/version_check.py
@@ -8,7 +8,6 @@
 Check that the Python version used is supported by VUnit
 """
 
-from __future__ import print_function
 import sys
 
 

diff --git a/vunit/vivado/vivado.py b/vunit/vivado/vivado.py
@@ -8,7 +8,6 @@
 Utilities for integrating with Vivado
 """
 
-from __future__ import print_function
 from subprocess import check_call
 from os import makedirs
 from os.path import abspath, join, dirname, exists, basename