Remove support for Python 2.x

Arrested will no longer officially support python 2.x and as such we will no longer test against python 2.x
mikeywaites · Nov 9, 2019 · 7cac3c3 · 7cac3c3
1 parent 6b97ce2
commit 7cac3c3
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 73 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -27,26 +27,6 @@ jobs:
           key: py3deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
           paths:
             - "py3venv"
-  build-python2:
-    <<: *defaults
-    docker:
-      - image: python:2
-    steps:
-      - checkout
-      - restore_cache:
-          key: py2deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
-      - run:
-          name: Install Python deps in a venv
-          command: |
-            [ -d py2venv ] && echo 'exists' || virtualenv py2venv
-            . py2venv/bin/activate
-            pip install -r requirements.txt
-            python setup.py develop
-      - save_cache:
-          key: py2deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
-          paths:
-            - "py2venv"
-
   test-python3:
     <<: *defaults
     docker:
@@ -65,26 +45,6 @@ jobs:
           paths:
             - "py3venv"
             - ".coverage"
-
-  test-python2:
-    <<: *defaults
-    docker:
-      - image: python:2
-    steps:
-      - checkout
-      - restore_cache:
-          key: py2deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
-      - run:
-          command: |
-            . ~/flask-arrested/py2venv/bin/activate
-            python setup.py develop
-            py.test -s --cov=arrested --cov-report=term-missing --tb=short tests/
-      - save_cache:
-          key: py2testreport-{{ .Branch }}-{{ .Revision }}
-          paths:
-            - "py2venv"
-            - ".coverage"
-
   release:
     <<: *defaults
     docker:
@@ -125,11 +85,7 @@ workflows:
   version: 2
   build_test_and_deploy:
     jobs:
-      - build-python2
       - build-python3
-      - test-python2:
-          requires:
-            - build-python2
       - test-python3:
           requires:
             - build-python3
@@ -140,13 +96,10 @@ workflows:
                 - master
                 - wip/version-0.1.0
           requires:
-            - test-python2
             - test-python3
       - docs:
           requires:
-            - test-python2
             - test-python3
       - coverage:
           requires:
-            - test-python2
             - test-python3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 ========================
 
+v2.0.0
+----------------------
+
+* Dropped support for Python 2.x
+
 v0.1.3
 -----------------------
 

diff --git a/Dockerfile.py2 b/Dockerfile.py2
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,16 +12,6 @@ services:
     tty: true
     stdin_open: true
 
-  py2:
-    build:
-      context: .
-      dockerfile: Dockerfile.py2
-    command: py.test -s --cov=arrested --cov-report=term-missing --tb=short tests/
-    volumes:
-      - .:/opt/code
-    tty: true
-    stdin_open: true
-
   api:
     build:
       context: example/

diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
-pytest==3.2.1
+pytest==5.2.2
 sphinx
-pytest-cov
+pytest-cov==2.8.1
 ipdb
 flask_sqlalchemy
 py-kim

diff --git a/run_unit_tests.sh b/run_unit_tests.sh
@@ -1,2 +1 @@
-docker-compose run py2
 docker-compose run py3
diff --git a/setup.py b/setup.py
@@ -23,12 +23,12 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Internet :: WWW/HTTP :: WSGI',