Remove Python 2.7 stuff

I don't really want to support that version, so there's no need to have it in the continuous integration builds or anywhere else. Hope I did catch every occurrence.
oemof · Nov 22, 2018 · 1bd49cf · 1bd49cf
1 parent da4cee8
commit 1bd49cf
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 58 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,12 +10,6 @@ env:
     - TOXENV=docs
 matrix:
   include:
-    - python: '2.7'
-      env:
-        - TOXENV=py27-cover,report,coveralls,codecov
-    - python: '2.7'
-      env:
-        - TOXENV=py27-nocov
     - python: '3.4'
       env:
         - TOXENV=py34-cover,report,coveralls,codecov

diff --git a/appveyor.yml b/appveyor.yml
@@ -7,33 +7,10 @@ environment:
     WITH_COMPILER: 'cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd'
   matrix:
     - TOXENV: check
-      TOXPYTHON: C:\Python27\python.exe
-      PYTHON_HOME: C:\Python27
-      PYTHON_VERSION: '2.7'
-      PYTHON_ARCH: '32'
-    - TOXENV: 'py27-cover,report,codecov'
-      TOXPYTHON: C:\Python27\python.exe
-      PYTHON_HOME: C:\Python27
-      PYTHON_VERSION: '2.7'
-      PYTHON_ARCH: '32'
-    - TOXENV: 'py27-cover,report,codecov'
-      TOXPYTHON: C:\Python27-x64\python.exe
-      WINDOWS_SDK_VERSION: v7.0
-      PYTHON_HOME: C:\Python27-x64
-      PYTHON_VERSION: '2.7'
-      PYTHON_ARCH: '64'
-
-    - TOXENV: 'py27-nocov'
-      TOXPYTHON: C:\Python27\python.exe
-      PYTHON_HOME: C:\Python27
-      PYTHON_VERSION: '2.7'
+      TOXPYTHON: C:\Python34\python.exe
+      PYTHON_HOME: C:\Python34
+      PYTHON_VERSION: '3.4'
       PYTHON_ARCH: '32'
-    - TOXENV: 'py27-nocov'
-      TOXPYTHON: C:\Python27-x64\python.exe
-      WINDOWS_SDK_VERSION: v7.0
-      PYTHON_HOME: C:\Python27-x64
-      PYTHON_VERSION: '2.7'
-      PYTHON_ARCH: '64'
 
     - TOXENV: 'py34-cover,report,codecov'
       TOXPYTHON: C:\Python34\python.exe

diff --git a/ci/appveyor-bootstrap.py b/ci/appveyor-bootstrap.py
@@ -18,8 +18,6 @@
 GET_PIP_URL = "https://bootstrap.pypa.io/get-pip.py"
 GET_PIP_PATH = "C:\get-pip.py"
 URLS = {
-    ("2.7", "64"): BASE_URL + "2.7.13/python-2.7.13.amd64.msi",
-    ("2.7", "32"): BASE_URL + "2.7.13/python-2.7.13.msi",
     ("3.4", "64"): BASE_URL + "3.4.4/python-3.4.4.amd64.msi",
     ("3.4", "32"): BASE_URL + "3.4.4/python-3.4.4.msi",
     ("3.5", "64"): BASE_URL + "3.5.4/python-3.5.4-amd64.exe",
@@ -29,8 +27,6 @@
 }
 INSTALL_CMD = {
     # Commands are allowed to fail only if they are not the last command.  Eg: uninstall (/x) allowed to fail.
-    "2.7": [["msiexec.exe", "/L*+!", "install.log", "/qn", "/x", "{path}"],
-            ["msiexec.exe", "/L*+!", "install.log", "/qn", "/i", "{path}", "TARGETDIR={home}"]],
     "3.4": [["msiexec.exe", "/L*+!", "install.log", "/qn", "/x", "{path}"],
             ["msiexec.exe", "/L*+!", "install.log", "/qn", "/i", "{path}", "TARGETDIR={home}"]],
     "3.5": [["{path}", "/quiet", "TargetDir={home}"]],

diff --git a/ci/templates/appveyor.yml b/ci/templates/appveyor.yml
@@ -7,9 +7,9 @@ environment:
     WITH_COMPILER: 'cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd'
   matrix:
     - TOXENV: check
-      TOXPYTHON: C:\Python27\python.exe
-      PYTHON_HOME: C:\Python27
-      PYTHON_VERSION: '2.7'
+      TOXPYTHON: C:\Python34\python.exe
+      PYTHON_HOME: C:\Python34
+      PYTHON_VERSION: '3.4'
       PYTHON_ARCH: '32'
 {% for env, config in tox_environments|dictsort %}{{ '' }}{% if env.startswith(('py2', 'py3')) %}
     - TOXENV: '{{ env }}{% if config.cover %},report,codecov{% endif %}'

diff --git a/ci/templates/tox.ini b/ci/templates/tox.ini
@@ -10,7 +10,7 @@ envlist =
 
 [testenv]
 basepython =
-    {docs,spell}: {env:TOXPYTHON:python2.7}
+    {docs,spell}: {env:TOXPYTHON:python3}
     {bootstrap,clean,check,report,codecov,coveralls}: {env:TOXPYTHON:python3}
 setenv =
     PYTHONPATH={toxinidir}/tests

diff --git a/setup.py b/setup.py
@@ -53,7 +53,6 @@ def read(*names, **kwargs):
         'Operating System :: POSIX',
         'Operating System :: Microsoft :: Windows',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',

diff --git a/tox.ini b/tox.ini
@@ -3,8 +3,6 @@ envlist =
     clean,
     check,
     docs,
-    py27-cover,
-    py27-nocov,
     py34-cover,
     py34-nocov,
     py35-cover,
@@ -21,7 +19,7 @@ envlist =
 
 [testenv]
 basepython =
-    {docs,spell}: {env:TOXPYTHON:python2.7}
+    {docs,spell}: {env:TOXPYTHON:python3}
     {bootstrap,clean,check,report,codecov,coveralls}: {env:TOXPYTHON:python3}
 setenv =
     PYTHONPATH={toxinidir}/tests
@@ -104,20 +102,6 @@ commands = coverage erase
 skip_install = true
 deps = coverage
 
-[testenv:py27-cover]
-basepython = {env:TOXPYTHON:python2.7}
-setenv =
-    {[testenv]setenv}
-usedevelop = true
-commands =
-    {posargs:nosetests --with-coverage --cover-package=oemof.tabular}
-deps =
-    {[testenv]deps}
-    coverage
-
-[testenv:py27-nocov]
-basepython = {env:TOXPYTHON:python2.7}
-
 [testenv:py34-cover]
 basepython = {env:TOXPYTHON:python3.4}
 setenv =