From 58c090611f92705e3947dc0a4e2aa2180b152215 Mon Sep 17 00:00:00 2001
From: Alex Tomkins <tomkins@darkzone.net>
Date: Sat, 14 Dec 2024 16:17:13 +0000
Subject: [PATCH 1/2] Don't persist git credentials after checkout

---
 .github/workflows/ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 248a371..da051ab 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,6 +7,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
@@ -27,6 +29,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
@@ -61,6 +65,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: Setup Python
         uses: actions/setup-python@v5
         with:

From e48eaa5d7e924ed4461c0fed73a36cf1959c78c8 Mon Sep 17 00:00:00 2001
From: Alex Tomkins <tomkins@darkzone.net>
Date: Mon, 16 Dec 2024 10:06:26 +0000
Subject: [PATCH 2/2] Drop Python 3.5 support

---
 .github/workflows/ci.yml | 1 -
 Makefile                 | 4 ++--
 setup.py                 | 3 +--
 tox.ini                  | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index da051ab..d18eda8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,7 +51,6 @@ jobs:
     strategy:
       matrix:
         python:
-          - '3.5'
           - '3.6'
           - '3.7'
           - '3.8'
diff --git a/Makefile b/Makefile
index 1178106..7eb3a81 100644
--- a/Makefile
+++ b/Makefile
@@ -138,10 +138,10 @@ coverage-clean:
 
 # Black
 black-lint:
-	black --line-length 99 --target-version py35 --exclude '/migrations/' --check findreplace tests setup.py
+	black --line-length 99 --target-version py36 --exclude '/migrations/' --check findreplace tests setup.py
 
 black-format:
-	black --line-length 99 --target-version py35 --exclude '/migrations/' findreplace tests setup.py
+	black --line-length 99 --target-version py36 --exclude '/migrations/' findreplace tests setup.py
 
 
 #pipdeptree
diff --git a/setup.py b/setup.py
index 7d00bb7..c13577a 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def read(filename):
     platforms=["any"],
     packages=find_packages(exclude=["tests"]),
     include_package_data=True,
-    python_requires=">=3.5",
+    python_requires=">=3.6",
     install_requires=["Django>=1.11"],
     classifiers=[
         "Intended Audience :: Developers",
@@ -29,7 +29,6 @@ def read(filename):
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
diff --git a/tox.ini b/tox.ini
index d31c2da..b2c7d63 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,8 +2,8 @@
 envlist =
     check
     lint
-    {py35,py36,py37}-django1.11
-    {py35,py36,py37,py38}-django2.2
+    {py36,py37}-django1.11
+    {py36,py37,py38}-django2.2
     coverage
 skipsdist = true