release 4.2

pingcap · Aug 18, 2023 · 799303b · 799303b
1 parent 5dc2a33
commit 799303b
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 272 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,12 +26,11 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
+          - '3.8'
           - '3.9'
           - '3.10'
           - '3.11'
         django-version:
-          - '3.2.20'
-          - '4.1.10'
           - '4.2.4'
         tidb-version:
           - 'v7.1.1'
@@ -47,9 +46,6 @@ jobs:
             tidb-version: 'v4.0.15'
           - django-version: '4.2.4'
             tidb-version: 'v5.4.3'
-          # Django 3.2 is under extended support, some functions are not compatible with Python 3.11
-          - python-version: '3.11'
-            django-version: '3.2.20'
 
     name: py${{ matrix.python-version }}_tidb${{ matrix.tidb-version }}_django${{ matrix.django-version }}
     runs-on: ubuntu-latest

diff --git a/django_test_apps.txt b/django_test_apps.txt
@@ -29,6 +29,7 @@ dates
 datetimes
 db_typecasts
 db_utils
+db_functions
 defer
 defer_regress
 delete

diff --git a/django_test_suite.sh b/django_test_suite.sh
@@ -20,12 +20,14 @@ export PYTHONUNBUFFERED=1
 export DJANGO_TESTS_DIR="django_tests_dir"
 mkdir -p $DJANGO_TESTS_DIR
 
-pip3 install .
+pip3 install -e .
 git clone --depth 1  --branch $DJANGO_VERSION https://github.com/django/django.git $DJANGO_TESTS_DIR/django
 cp tidb_settings.py $DJANGO_TESTS_DIR/django/tidb_settings.py
 cp tidb_settings.py $DJANGO_TESTS_DIR/django/tests/tidb_settings.py
 
-cd $DJANGO_TESTS_DIR/django && pip3 install -e . && pip3 install -r tests/requirements/py3.txt && pip3 install -r tests/requirements/mysql.txt; cd ../../
+# Do not install django in editable mode until this issue is fixed: https://github.com/python/cpython/issues/108078
+# Django Ticket: https://code.djangoproject.com/ticket/34780
+cd $DJANGO_TESTS_DIR/django && pip3 install . && pip3 install -r tests/requirements/py3.txt && pip3 install -r tests/requirements/mysql.txt; cd ../../
 cd $DJANGO_TESTS_DIR/django/tests
 
 EXIT_STATUS=0

diff --git a/django_tidb/__init__.py b/django_tidb/__init__.py
@@ -15,6 +15,6 @@
 # wrong version of Django is installed.
 from .functions import register_functions
 
-__version__ = "3.0.0"
+__version__ = "4.2.0"
 
 register_functions()
diff --git a/django_tidb/features.py b/django_tidb/features.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -10,18 +10,15 @@ authors = [
 ]
 description = "Django backend for TiDB"
 readme = "README.md"
-requires-python = ">=3.6"
+requires-python = ">=3.8"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Framework :: Django",
-    "Framework :: Django :: 3.2",
-    "Framework :: Django :: 4.1",
+    "Framework :: Django :: 4.2",
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.6",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",

diff --git a/tidb_settings.py b/tidb_settings.py
@@ -45,3 +45,8 @@
 DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 USE_TZ = False
 SECRET_KEY = 'django_tests_secret_key'
+
+# Use a fast hasher to speed up tests.
+PASSWORD_HASHERS = [
+    "django.contrib.auth.hashers.MD5PasswordHasher",
+]
diff --git a/tox.ini b/tox.ini
@@ -13,11 +13,10 @@
 
 [tox]
 alwayscopy=true
-envlist = py310,py39,py38,py37,lint
+envlist = py311,py310,py39,py38,lint
 
 [gh-actions]
 python =
-    3.7: py37
     3.8: py38
     3.9: py39
     3.10: py310