Merge branch 'master' into jenkins/zshkoor/setup-py-updated-8928cd6

.github/workflows/ci.yml

@@ -13,9 +13,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
-        python-version: ['3.8']
-        toxenv: [quality, django32, django42]
+        os: [ubuntu-latest]
+        python-version: ['3.11', '3.12']
+        toxenv: [quality, django42, check_keywords]
 
     steps:
     - uses: actions/checkout@v3
@@ -36,8 +36,9 @@ jobs:
       run: tox
 
     - name: Run Coverage
-      if: matrix.python-version == '3.8' && matrix.toxenv=='django42'
-      uses: codecov/codecov-action@v3
+      if: matrix.python-version == '3.11' && matrix.toxenv=='django42'
+      uses: codecov/codecov-action@v4
       with:
+        token: ${{ secrets.CODECOV_TOKEN }}
         flags: unittests
         fail_ci_if_error: true

.github/workflows/pypi-publish.yml

@@ -8,15 +8,15 @@ on:
 jobs:
 
   push:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
         uses: actions/checkout@v3
       - name: setup python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: 3.11
 
       - name: Install pip
         run: pip install -r requirements/pip.txt
@@ -28,7 +28,7 @@ jobs:
         run: python setup.py sdist bdist_wheel
 
       - name: Publish to PyPi
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.PYPI_UPLOAD_TOKEN }}

.gitignore

@@ -55,3 +55,4 @@ target/
 
 # JetBrains/PyCharm
 .idea/
+venv

CHANGELOG.rst

@@ -14,11 +14,23 @@ Unreleased
 
 *
 
+Added
+~~~~~~~
+
+[4.4.0] - 2024-09-10
+--------------------
+
+* Dropped support for python3.8
+
+[4.3.0] - 2024-04-01
+--------------------
+
+* Added support for python3.11 and 3.12
+* Dropped django 3.2 support.
+
 [4.2.0] - 2023-08-03
 --------------------
 
-Added
-~~~~~~~
 * Added support for Django 4.2
 
 [4.1.0] - 2022-01-28

Makefile

@@ -1,4 +1,4 @@
-.PHONY: clean quality requirements test upgrade
+.PHONY: clean quality requirements test upgrade check_keywords
 
 clean:
 	coverage erase
@@ -45,3 +45,6 @@ upgrade: $(COMMON_CONSTRAINTS_TXT)  ## update the requirements/*.txt files with
 	# Let tox control the Django version for tests
 	sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp
 	mv requirements/test.tmp requirements/test.txt
+
+check_keywords: ## Scan the Django models in all installed apps in this project for restricted field names
+	python manage.py check_reserved_keywords --override_file db_keyword_overrides.yml

README.rst

@@ -139,7 +139,7 @@ Please read `How To Contribute <https://github.com/openedx/.github/blob/master/C
 Reporting Security Issues
 -------------------------
 
-Please do not report security issues in public. Please email security@edx.org.
+Please do not report security issues in public. Please email security@openedx.org.
 
 Mailing List and IRC Channel
 ----------------------------

auth_backends/__init__.py

@@ -3,4 +3,4 @@
  These package is designed to be used primarily with Open edX Django projects, but should be compatible with non-edX
  projects as well.
 """
-__version__ = '4.2.0'  # pragma: no cover
+__version__ = '4.4.0'  # pragma: no cover

db_keyword_overrides.yml

@@ -0,0 +1,10 @@
+# This file is used by the 'check_reserved_keywords' management command to allow specific field names to be overridden
+# when checking for conflicts with lists of restricted keywords used in various database/data warehouse tools.
+# For more information, see: https://github.com/edx/edx-django-release-util/release_util/management/commands/check_reserved_keywords.py
+#
+# overrides should be added in the following format:
+#   - ModelName.field_name
+---
+MYSQL:
+SNOWFLAKE:
+STITCH:

requirements/base.txt

@@ -1,63 +1,59 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade
 #
-asgiref==3.7.2
+asgiref==3.8.1
     # via django
-certifi==2023.7.22
+certifi==2024.8.30
     # via requests
-cffi==1.15.1
+cffi==1.17.1
     # via cryptography
-charset-normalizer==3.2.0
+charset-normalizer==3.4.0
     # via requests
-cryptography==41.0.3
+cryptography==44.0.0
     # via
     #   pyjwt
     #   social-auth-core
-defusedxml==0.7.1
+defusedxml==0.8.0rc2
     # via
     #   python3-openid
     #   social-auth-core
-django==3.2.20
+django==4.2.17
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
     #   social-auth-app-django
-idna==3.4
+idna==3.10
     # via requests
 oauthlib==3.2.2
     # via
     #   requests-oauthlib
     #   social-auth-core
-pycparser==2.21
+pycparser==2.22
     # via cffi
-pyjwt[crypto]==2.8.0
+pyjwt[crypto]==2.10.1
     # via
     #   -r requirements/base.in
     #   social-auth-core
 python3-openid==3.2.0
     # via social-auth-core
-pytz==2023.3
-    # via django
-requests==2.31.0
+requests==2.32.3
     # via
     #   requests-oauthlib
     #   social-auth-core
-requests-oauthlib==1.3.1
+requests-oauthlib==2.0.0
     # via social-auth-core
-six==1.16.0
+six==1.17.0
     # via -r requirements/base.in
-social-auth-app-django==5.2.0
+social-auth-app-django==5.4.2
     # via -r requirements/base.in
-social-auth-core==4.4.2
+social-auth-core==4.5.4
     # via
     #   -r requirements/base.in
     #   social-auth-app-django
-sqlparse==0.4.4
+sqlparse==0.5.2
     # via django
-typing-extensions==4.7.1
-    # via asgiref
-urllib3==2.0.4
+urllib3==2.2.3
     # via requests

requirements/ci.in

@@ -2,4 +2,3 @@
 -c constraints.txt
 
 tox                       # Virtualenv management for tests
-tox-battery               # Makes tox aware of requirements file changes

requirements/ci.txt

@@ -1,35 +1,28 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade
 #
-distlib==0.3.7
+distlib==0.3.9
     # via virtualenv
-filelock==3.12.3
+filelock==3.16.1
     # via
     #   tox
     #   virtualenv
-packaging==23.1
+packaging==24.2
     # via tox
-platformdirs==3.10.0
+platformdirs==4.3.6
     # via virtualenv
-pluggy==1.3.0
+pluggy==1.5.0
     # via tox
 py==1.11.0
     # via tox
-six==1.16.0
-    # via tox
-tomli==2.0.1
+six==1.17.0
     # via tox
 tox==3.28.0
     # via
-    #   -c requirements/common_constraints.txt
+    #   -c requirements/constraints.txt
     #   -r requirements/ci.in
-    #   tox-battery
-tox-battery==0.6.2
-    # via -r requirements/ci.in
-typing-extensions==4.7.1
-    # via filelock
-virtualenv==20.24.4
+virtualenv==20.28.0
     # via tox

requirements/common_constraints.txt

@@ -11,17 +11,17 @@
 # Note: Changes to this file will automatically be used by other repos, referencing
 #  this file from Github directly. It does not require packaging in edx-lint.
 
-
 # using LTS django version
-Django<4.0
+Django<5.0
 
 # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
 # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
+# See https://github.com/openedx/edx-platform/issues/35126 for more info
 elasticsearch<7.14.0
 
 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
 django-simple-history==3.0.0
 
-# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
-# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
-tox<4.0.0
+# Cause: https://github.com/openedx/edx-lint/issues/458
+# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved.
+pip<24.3

requirements/constraints.txt

@@ -9,3 +9,11 @@
 # linking to it here is good.
 
 -c common_constraints.txt
+
+# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
+# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
+tox<4.0.0
+
+
+# Temporary to Support the python 3.11 Upgrade
+backports.zoneinfo;python_version<"3.9"  # Newer versions have zoneinfo available in the standard library