Drop support for EOL Python

hugovk · hugovk · commit 79ec255aa1f9 · 2018-10-03T08:50:52.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ language: python
 sudo: false
 cache: pip
 python:
-- '2.6'
 - '2.7'
 - '3.4'
 - '3.5'
@@ -11,7 +10,6 @@ env:
   global:
     - CC_TEST_REPORTER_ID=$TRAVIS_CODE_CLIMATE_TOKEN
 install:
-- if [[ $TRAVIS_PYTHON_VERSION == 2.6* ]]; then pip install unittest2; fi
 - python setup.py install
 - pip install pyyaml
 - pip install flask
@@ -30,7 +28,7 @@ before_script:
 - chmod +x ./cc-test-reporter
 - ./cc-test-reporter before-build
 script:
-- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then coverage run -m unittest2 discover; else coverage run -m unittest discover; fi
+- coverage run -m unittest discover
 after_script:
 - codecov
 - ./cc-test-reporter after-build --exit-code $?
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -70,7 +70,7 @@ You can use our Docker image to avoid setting up the development environment you
 
 ##### Prerequisites #####
 
-- Python 2.6 through 3.6
+- Python 2.7 and 3.4+
 - [python_http_client](https://github.com/sendgrid/python-http-client)
 
 ##### Initial setup: #####
@@ -122,12 +122,6 @@ All test files are in the [`test`](https://github.com/sendgrid/sendgrid-python/t
 
 For the purposes of contributing to this repo, please update the [`test_sendgrid.py`](https://github.com/sendgrid/sendgrid-python/tree/master/test/test_sendgrid.py) file with unit tests as you modify the code.
 
-For Python 2.6.*:
-
-`unit2 discover -v`
-
-For Python 2.7.* and up:
-
 `python -m unittest discover -v`
 
 ### Testing Multiple Versions of Python
@@ -149,7 +143,6 @@ You can install it by yourself in user dir by calling `source test/prism.sh`.
 Add ```eval "$(pyenv init -)"``` to your shell environment (.profile, .bashrc, etc) after installing tox, you only need to do this once.
 
 ```
-pyenv install 2.6.9
 pyenv install 2.7.11
 pyenv install 3.4.3
 pyenv install 3.5.0
@@ -159,7 +152,7 @@ Make sure to change the current working directory to your local version of the r
 python setup.py install
 ```
 ```
-pyenv local 3.5.0 3.4.3 2.7.11 2.6.9
+pyenv local 3.5.0 3.4.3 2.7.11
 pyenv rehash
 ```
 
diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ We appreciate your continued support, thank you!
 
 ## Prerequisites
 
-- Python version 2.6, 2.7, 3.4, 3.5 or 3.6
+- Python version 2.7 and 3.4+
 - The SendGrid service, starting at the [free level](https://sendgrid.com/free?source=sendgrid-python)
 
 ## Setup Environment Variables
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu:xenial
-ENV PYTHON_VERSIONS='python2.6 python2.7 python3.4 python3.5 python3.6' \
+ENV PYTHON_VERSIONS='python2.7 python3.4 python3.5 python3.6' \
     OAI_SPEC_URL="https://raw.githubusercontent.com/sendgrid/sendgrid-oai/master/oai_stoplight.json"
 
 # install testing versions of python, including old versions, from deadsnakes
diff --git a/setup.py b/setup.py
@@ -1,4 +1,3 @@
-import sys
 import os
 from io import open
 from setuptools import setup, find_packages
@@ -14,10 +13,6 @@
 
 def getRequires():
     deps = ['python_http_client>=3.0']
-    if sys.version_info < (2, 7):
-        deps.append('unittest2')
-    elif (3, 0) <= sys.version_info < (3, 2):
-        deps.append('unittest2py3k')
     return deps
 
 setup(
@@ -32,11 +27,11 @@ def getRequires():
     description='SendGrid library for Python',
     long_description=long_description,
     install_requires=getRequires(),
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
     classifiers=[
-        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6'
diff --git a/test/test_app.py b/test/test_app.py
@@ -1,13 +1,9 @@
 import os
+import unittest
 
 from sendgrid.helpers.inbound.config import Config
 from sendgrid.helpers.inbound.app import app
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
 
 class UnitTests(unittest.TestCase):
 
diff --git a/test/test_config.py b/test/test_config.py
@@ -1,10 +1,8 @@
 import os
+import unittest
+
 import sendgrid.helpers.inbound.config
 from sendgrid.helpers.inbound.config import Config
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
 
 
 class UnitTests(unittest.TestCase):
diff --git a/test/test_email.py b/test/test_email.py
@@ -1,13 +1,8 @@
 # -*- coding: utf-8 -*-
-import json
+import unittest
 
 from sendgrid.helpers.mail import (Email)
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
 
 class TestEmailObject(unittest.TestCase):
 
diff --git a/test/test_mail.py b/test/test_mail.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import json
+import unittest
 
 from sendgrid.helpers.mail import (
     ASM,
@@ -29,11 +30,6 @@
     ValidateAPIKey
 )
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
 
 class UnitTests(unittest.TestCase):
 
diff --git a/test/test_parse.py b/test/test_parse.py
@@ -1,11 +1,8 @@
+import unittest
+
 from sendgrid.helpers.inbound.config import Config
 from sendgrid.helpers.inbound.app import app
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
 
 class UnitTests(unittest.TestCase):
 
diff --git a/test/test_project.py b/test/test_project.py
@@ -1,9 +1,6 @@
 import os
+import unittest
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
 
 class ProjectTests(unittest.TestCase):
 
diff --git a/test/test_send.py b/test/test_send.py
@@ -1,10 +1,7 @@
 import argparse
-from sendgrid.helpers.inbound import send
+import unittest
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+from sendgrid.helpers.inbound import send
 
 try:
     import unittest.mock as mock
diff --git a/test/test_sendgrid.py b/test/test_sendgrid.py
@@ -1,15 +1,9 @@
 import sendgrid
 from sendgrid.helpers.mail import *
 from sendgrid.version import __version__
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
 import os
-import subprocess
-import sys
-import time
 import datetime
+import unittest
 
 host = "http://localhost:4010"
 
diff --git a/tox.ini b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py34, py35, py36
+envlist = py27, py34, py35, py36
 
 [testenv]
 commands = coverage erase
@@ -14,15 +14,6 @@ deps = -rrequirements.txt
        coverage
 
 
-[testenv:py26]
-commands = coverage erase
-           coverage run {envbindir}/unit2 discover -v []
-           coverage report
-deps = unittest2
-       mock
-       {[testenv]deps}
-basepython = python2.6
-
 [testenv:py27]
 commands = {[testenv]commands}
 deps = {[testenv]deps}
diff --git a/use_cases/aws.md b/use_cases/aws.md
@@ -9,7 +9,7 @@ The neat thing is that CodeStar provides all of this in a pre-configured package
 Once this tutorial is complete, you'll have a basic web service for sending email that can be invoked via a link to your newly created API endpoint.
 
 ### Prerequisites
-Python 2.6, 2.7, 3.4, or 3.5 are supported by the sendgrid Python library, however I was able to utilize 3.6 with no issue.
+Python 2.7 and 3.4 or 3.5 are supported by the sendgrid Python library, however I was able to utilize 3.6 with no issue.
 
 Before starting this tutorial, you will need to have access to an AWS account in which you are allowed to provision resources. This tutorial also assumes you've already created a SendGrid account with free-tier access. Finally, it is highly recommended you utilize [virtualenv](https://virtualenv.pypa.io/en/stable/).
 
