From 8f28b71cb64eaea75412b47d794f60c34acfeabb Mon Sep 17 00:00:00 2001
From: Irtaza Akram <irtaza.akram@arbisoft.com>
Date: Fri, 16 Feb 2024 16:31:55 +0500
Subject: [PATCH 1/2] feat: add support for python 3.12

---
 .github/workflows/ci.yml  | 4 ++--
 organizations/__init__.py | 2 +-
 setup.py                  | 3 +--
 tox.ini                   | 6 ++----
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8020221..a43d9a8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,8 +14,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: ['3.8']
-        toxenv: [django32, django40, django42, quality]
+        python-version: ['3.8', '3.12']
+        toxenv: [django42, quality]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/organizations/__init__.py b/organizations/__init__.py
index 549c79c..7f810e1 100644
--- a/organizations/__init__.py
+++ b/organizations/__init__.py
@@ -1,4 +1,4 @@
 """
 edx-organizations app initialization module
 """
-__version__ = '6.12.1'  # pragma: no cover
+__version__ = '6.13.0'  # pragma: no cover
diff --git a/setup.py b/setup.py
index 841c891..22ab098 100644
--- a/setup.py
+++ b/setup.py
@@ -57,8 +57,6 @@ def get_version(*file_paths):
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Framework :: Django',
-        'Framework :: Django :: 3.2',
-        'Framework :: Django :: 4.0',
         'Framework :: Django :: 4.2',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: GNU Affero General Public License v3',
@@ -66,6 +64,7 @@ def get_version(*file_paths):
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.12',
     ],
     packages=find_packages(exclude=['tests']),
     install_requires=load_requirements('requirements/base.in'),
diff --git a/tox.ini b/tox.ini
index 3992ee9..03a09f2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,11 @@
 [tox]
-envlist = py38-django{32,40,42}, quality
+envlist = py{38,312}-django{42}, quality
 
 [testenv]
 setenv = 
     DJANGO_SETTINGS_MODULE = test_settings
     PYTHONPATH = {toxinidir}
 deps = 
-    django32: Django>=3.2,<4.0
-    django40: Django>=4.0,<4.1
     django42: Django>=4.2,<4.3
     -rtest-requirements.txt
 commands = 
@@ -18,7 +16,7 @@ commands =
 setenv = 
     PYTHONPATH = {toxinidir}
 deps = 
-    Django>=3.2,<4.0
+    Django>=4.2,<4.3
     -rtest-requirements.txt
 commands = 
     pycodestyle organizations

From eb81c3ccafb95cc11ecebf9de922227ac1408b01 Mon Sep 17 00:00:00 2001
From: Irtaza Akram <irtaza.akram@arbisoft.com>
Date: Fri, 16 Feb 2024 16:59:48 +0500
Subject: [PATCH 2/2] fix: dependencies

---
 .github/workflows/ci.yml | 1 +
 tox.ini                  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a43d9a8..578b66b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,6 +12,7 @@ jobs:
     name: Tests
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-20.04]
         python-version: ['3.8', '3.12']
diff --git a/tox.ini b/tox.ini
index 03a09f2..51af00b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,6 +6,7 @@ setenv =
     DJANGO_SETTINGS_MODULE = test_settings
     PYTHONPATH = {toxinidir}
 deps = 
+    setuptools
     django42: Django>=4.2,<4.3
     -rtest-requirements.txt
 commands = 
@@ -16,6 +17,7 @@ commands =
 setenv = 
     PYTHONPATH = {toxinidir}
 deps = 
+    setuptools
     Django>=4.2,<4.3
     -rtest-requirements.txt
 commands =