From 8ae576394ec9922cc1ab962697c2239b6a9a3325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikolai=20R=C3=B8ed=20Kristiansen?= <nrk@kindly.ai>
Date: Mon, 19 Sep 2022 14:31:04 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=A5=20Stop=20supporting=20EOL=20django?=
 =?UTF-8?q?s=20and=20pythons=20(#1337)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 💥 Stop supporting EOL djangos and pythons

* 👷 Run only supported version in test workflow
---
 .github/workflows/tests.yml | 10 +++-------
 setup.py                    |  9 ++++-----
 tox.ini                     | 14 ++++----------
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c63742a..c2cdc99 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,15 +8,11 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        django: ["2.2", "3.0", "3.1", "3.2"]
-        python-version: ["3.6", "3.7", "3.8", "3.9"]
+        django: ["3.2", "4.0", "4.1"]
+        python-version: ["3.8", "3.9", "3.10"]
         include:
           - django: "3.2"
-            python-version: "3.10"
-          - django: "4.0"
-            python-version: "3.10"
-          - django: "main"
-            python-version: "3.10"
+            python-version: "3.7"
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
diff --git a/setup.py b/setup.py
index 1762760..306ec33 100644
--- a/setup.py
+++ b/setup.py
@@ -46,16 +46,15 @@ setup(
         "Intended Audience :: Developers",
         "Topic :: Software Development :: Libraries",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Framework :: Django",
-        "Framework :: Django :: 2.2",
-        "Framework :: Django :: 3.0",
-        "Framework :: Django :: 3.1",
         "Framework :: Django :: 3.2",
+        "Framework :: Django :: 4.0",
+        "Framework :: Django :: 4.1",
     ],
     keywords="api graphql protocol rest relay graphene",
     packages=find_packages(exclude=["tests", "examples", "examples.*"]),
@@ -63,7 +62,7 @@ setup(
         "graphene>=3.0,<4",
         "graphql-core>=3.1.0,<4",
         "graphql-relay>=3.1.1,<4",
-        "Django>=2.2",
+        "Django>=3.2",
         "promise>=2.1",
         "text-unidecode",
     ],
diff --git a/tox.ini b/tox.ini
index d65839a..11b4893 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,11 @@
 [tox]
 envlist =
-    py{36,37,38,39}-django{22,30,31},
-    py{36,37,38,39,310}-django32,
-    py{38,39,310}-django{40,main},
+    py{37,38,39,310}-django32,
+    py{38,39,310}-django{40,41,main},
     black,flake8
 
 [gh-actions]
 python =
-    3.6: py36
     3.7: py37
     3.8: py38
     3.9: py39
@@ -15,11 +13,9 @@ python =
 
 [gh-actions:env]
 DJANGO =
-    2.2: django22
-    3.0: django30
-    3.1: django31
     3.2: django32
     4.0: django40
+    4.1: django41
     main: djangomain
 
 [testenv]
@@ -30,11 +26,9 @@ setenv =
 deps =
     -e.[test]
     psycopg2-binary
-    django22: Django>=2.2,<3.0
-    django30: Django>=3.0,<3.1
-    django31: Django>=3.1,<3.2
     django32: Django>=3.2,<4.0
     django40: Django>=4.0,<4.1
+    django41: Django>=4.1,<4.2
     djangomain: https://github.com/django/django/archive/main.zip
 commands = {posargs:py.test --cov=graphene_django graphene_django examples}