Merge pull request #239 from johngian/deprecate-py33-django18

Drop support for unsupported Django 1.8 and Python 3.3.
mozilla · May 28, 2018 · 35687c5 · 35687c5
2 parents 6f84a68 + 72a7f85
commit 35687c5
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 52 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -51,14 +51,6 @@ jobs:
           root: workspace
           paths:
             - mozilla-django-oidc-dev.tar.gz
-  e2e_test_py2_rs_django18:
-    docker:
-      - image: mozillaparsys/oidc_e2e_setup:py2
-        name: testoidcsetup
-        environment:
-          - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=1.8,<1.9
-    <<: *common_steps
   e2e_test_py2_rs_django111:
     docker:
       - image: mozillaparsys/oidc_e2e_setup:py2
@@ -67,14 +59,6 @@ jobs:
           - TEST_OIDC_ALGO=rs
           - DJANGO_VERSION=Django>=1.11,<2.0.0
     <<: *common_steps
-  e2e_test_py3_rs_django18:
-    docker:
-      - image: mozillaparsys/oidc_e2e_setup:py3
-        name: testoidcsetup
-        environment:
-          - TEST_OIDC_ALGO=rs
-          - DJANGO_VERSION=Django>=1.8,<1.9
-    <<: *common_steps
   e2e_test_py3_rs_django111:
     docker:
       - image: mozillaparsys/oidc_e2e_setup:py3
@@ -91,14 +75,6 @@ jobs:
           - TEST_OIDC_ALGO=rs
           - DJANGO_VERSION=Django>=2.0.0
     <<: *common_steps
-  e2e_test_py2_hs_django18:
-    docker:
-      - image: mozillaparsys/oidc_e2e_setup:py2
-        name: testoidcsetup
-        environment:
-          - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=1.8,<1.9
-    <<: *common_steps
   e2e_test_py2_hs_django111:
     docker:
       - image: mozillaparsys/oidc_e2e_setup:py2
@@ -107,14 +83,6 @@ jobs:
           - TEST_OIDC_ALGO=hs
           - DJANGO_VERSION=Django>=1.11,<2.0.0
     <<: *common_steps
-  e2e_test_py3_hs_django18:
-    docker:
-      - image: mozillaparsys/oidc_e2e_setup:py3
-        name: testoidcsetup
-        environment:
-          - TEST_OIDC_ALGO=hs
-          - DJANGO_VERSION=Django>=1.8,<1.9
-    <<: *common_steps
   e2e_test_py3_hs_django111:
     docker:
       - image: mozillaparsys/oidc_e2e_setup:py3
@@ -137,30 +105,18 @@ workflows:
   build_and_test:
     jobs:
       - build_lib
-      - e2e_test_py2_rs_django18:
-          requires:
-            - build_lib
       - e2e_test_py2_rs_django111:
           requires:
             - build_lib
-      - e2e_test_py2_hs_django18:
-          requires:
-            - build_lib
       - e2e_test_py2_hs_django111:
           requires:
             - build_lib
-      - e2e_test_py3_rs_django18:
-          requires:
-            - build_lib
       - e2e_test_py3_rs_django111:
           requires:
             - build_lib
       - e2e_test_py3_rs_django200:
           requires:
             - build_lib
-      - e2e_test_py3_hs_django18:
-          requires:
-            - build_lib
       - e2e_test_py3_hs_django111:
           requires:
             - build_lib

diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,6 @@ language: python
 
 python:
   - "2.7"
-  - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"
@@ -15,7 +14,7 @@ install:
   - pip install codecov tox-travis
 
 script:
-    - tox
+  - tox
 
 after_success:
   - codecov

diff --git a/setup.py b/setup.py
@@ -33,7 +33,7 @@
 history = open('HISTORY.rst').read().replace('.. :changelog:', '')
 
 install_requirements = [
-    'Django>1.7',
+    'Django >= 1.11',
     'josepy',
     'requests'
 ]
@@ -61,7 +61,6 @@
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Framework :: Django',
-        'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
         'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
@@ -72,7 +71,6 @@
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',

diff --git a/tox.ini b/tox.ini
@@ -1,14 +1,12 @@
 [tox]
 envlist =
     lint
-    py{27,33,34,35}-django18
     py{27,34,35,36}-django111
     py{34,35,36}-django200
 
 [travis]
 python =
   2.7: py27
-  3.3: py33
   3.4: py34
   3.5: py35
   3.6: py36, coverage, lint
@@ -20,7 +18,6 @@ setenv =
     PYTHONPATH={toxinidir}
 deps =
     -r{toxinidir}/tests/requirements.txt
-    django18: Django>=1.8,<1.9
     django111: Django>=1.11,<2.0.0
     django200: Django>=2.0.0