From e543fa1cc38f807a16a9f994078edb0c2c262ab9 Mon Sep 17 00:00:00 2001
From: farhan <mfarhan133@gmail.com>
Date: Thu, 22 Feb 2024 18:02:40 +0500
Subject: [PATCH] chore: Adds support of python 3.12

---
 .github/workflows/ci.yml     |  6 +++---
 CHANGELOG.rst                |  6 ++++++
 opaque_keys/__init__.py      |  2 +-
 requirements/constraints.txt | 14 +-------------
 tox.ini                      |  5 ++---
 5 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 54d1e808..6136b40a 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: [quality, docs, without-django, django32, django42]
+        python-version: ['3.8', '3.12']
+        toxenv: [quality, docs, without-django, django42]
 
     steps:
     - uses: actions/checkout@v2
@@ -36,7 +36,7 @@ jobs:
       run: tox -- --hypothesis-profile=ci
 
     - name: Run Coverage
-      if: matrix.python-version == '3.8' && matrix.toxenv=='django42'
+      if: matrix.python-version == '3.12' && matrix.toxenv=='django42'
       uses: codecov/codecov-action@v1
       with:
         flags: unittests
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1b932fb5..2e871f56 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,9 @@
+# 2.6.0
+
+* Added support for python 3.12
+* Dropped support for django 3.2
+
+
 # 2.5.1
 
 * Fixed - py.typed file wasn't installed properly via setuptools.
diff --git a/opaque_keys/__init__.py b/opaque_keys/__init__.py
index 1b7fec68..7bbeaea5 100644
--- a/opaque_keys/__init__.py
+++ b/opaque_keys/__init__.py
@@ -14,7 +14,7 @@
 from stevedore.enabled import EnabledExtensionManager
 from typing_extensions import Self  # For python 3.11 plus, can just use "from typing import Self"
 
-__version__ = '2.5.1'
+__version__ = '2.6.0'
 
 
 class InvalidKeyError(Exception):
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 8ff4d510..3420e3e5 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -8,16 +8,4 @@
 # pin when possible.  Writing an issue against the offending project and
 # linking to it here is good.
 
-# This file contains all common constraints for edx-repos
--c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
-
-# pytest>=5.6.0 fails to fetch the tests and hence all the tests fail
-pytest<5.6.0
-
-pytest-xdist<2.0.0
-
-# pytest (from `test.in`) requires pluggy<1.
-# We must constrain it here so that `ci.in` (which doesn't
-# include pytest) doesn't generate `ci.txt` with a pluggy version >=1. 
-# Remove this pin when pytest no longer requires pluggy<1.
-pluggy<1
+lxml<5.0.0
diff --git a/tox.ini b/tox.ini
index 5b5a6e43..1246cf44 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,9 @@
 [tox]
-envlist = py38-django{32,42},quality,without-django
+envlist = py{38,312}-django{42},quality,without-django
 skip_missing_interpreters = True
 
 [testenv]
-deps = 
-    django32: Django>=3.2,<4.0
+deps =
     django42: Django>=4.2,<4.3
     -r{toxinidir}/requirements/django-test.txt
 commands = pytest -v --disable-pytest-warnings --nomigrations {posargs}