From ff094ced2718ac320103639672671df6c4720724 Mon Sep 17 00:00:00 2001
From: Mark Walker <mark.walker@realbuzz.com>
Date: Mon, 13 Dec 2021 22:17:32 +0000
Subject: [PATCH 1/2] Added django 2.2 to supported versions and prepared for a
 1.0.4 release

---
 adminsortable2/__init__.py | 2 +-
 docs/source/changelog.rst  | 7 +++++++
 setup.py                   | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/adminsortable2/__init__.py b/adminsortable2/__init__.py
index 3f6fab6..8a81504 100644
--- a/adminsortable2/__init__.py
+++ b/adminsortable2/__init__.py
@@ -1 +1 @@
-__version__ = '1.0.3'
+__version__ = '1.0.4'
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index 44b9d1f..7c567e1 100644
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -5,6 +5,12 @@ Release history
 ===============
 
 
+1.0.4
+-----
+* Fix `#294`_: issue in 1.0.3 where ``install_requires`` unintentionally dropped django 2.2
+
+.. _#294: https://github.com/jrief/django-admin-sortable2/issues/294
+
 1.0.3
 -----
 * Adding support for Django 4 and Python 3.10.
@@ -34,6 +40,7 @@ Release history
 * Fix `#207`_: Last item not displayed in stacked- and tabular inline admins,
   if model doesn't have add permission.
 
+.. _#207: https://github.com/jrief/django-admin-sortable2/issues/207
 
 0.7.7
 -----
diff --git a/setup.py b/setup.py
index 1f21dfb..5a94c7a 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@ def readfile(filename):
     platforms=['OS Independent'],
     classifiers=CLASSIFIERS,
     install_requires=[
-        'Django>=3.2,<4.1',
+        'Django>=2.2,<4.1',
     ],
     packages=find_packages(exclude=['example', 'docs']),
     include_package_data=True,

From 6aec140fad1d9ba0c9488401a8b691106777b796 Mon Sep 17 00:00:00 2001
From: Mark Walker <mark.walker@realbuzz.com>
Date: Sat, 22 Jan 2022 16:36:23 +0000
Subject: [PATCH 2/2] Move test pypi trigger to pushes to master

(cherry picked from commit d02f79a750e64d5619e21d6aeb4fef8584a6f68b)
---
 .github/workflows/publish-to-test-pypi.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml
index 5f90187..9360732 100644
--- a/.github/workflows/publish-to-test-pypi.yml
+++ b/.github/workflows/publish-to-test-pypi.yml
@@ -1,6 +1,9 @@
 name: Publish Python 🐍 distributions 📦 to TestPyPI
 
-on: pull_request
+on:
+  push:
+    branches:
+      - master
 
 jobs:
   build-n-publish: