Merge branch 'main' into main

Author: artush96

.github/workflows/codeql-analysis.yml

@@ -40,7 +40,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -51,7 +51,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -65,4 +65,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/workflow.yaml

@@ -30,16 +30,47 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version:
+        python:
           - 3.8
           - 3.9
+          - "3.10"
+          - 3.11
+          - 3.12
         django:
           - 3.2
           - 4.0
+          - 4.1
+          - 4.2
+          - 5.0
+          - 5.1
         database:
           - sqlite
           - mysql
           - postgres
+        exclude:
+          # django 3.2
+          - python: 3.11
+            django: 3.2
+          - python: 3.12
+            django: 3.2
+          # django 4.0
+          - python: 3.11
+            django: 4.0
+          - python: 3.12
+            django: 4.0
+          # django 4.1
+          - python: 3.12
+            django: 4.1
+          # django 5.0
+          - python: 3.8
+            django: 5.0
+          - python: 3.9
+            django: 5.0
+          # django 5.1
+          - python: 3.8
+            django: 5.1
+          - python: 3.9
+            django: 5.1
 
     # additional service containers to run
     services:
@@ -83,36 +114,47 @@ jobs:
       - uses: actions/checkout@v4
 
       # install python
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+      - name: Set up Python ${{ matrix.python }}
+        uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: ${{ matrix.python }}
 
       # upgrade pip
       - name: Update pip
         run: python -m pip install --upgrade pip
 
       # install environment specific dependencies
       - name: Install coverage
-        run: pip install coverage>=5.3
+        run: pip install coverage>=7.6.0 setuptools
 
       - name: Install Django 3.2
         if: matrix.django == 3.2
         run: pip install "Django>=3.2,<4.0"
       - name: Install Django 4.0
         if: matrix.django == 4.0
         run: pip install "Django>=4.0,<4.1"
+      - name: Install Django 4.1
+        if: matrix.django == 4.1
+        run: pip install "Django>=4.1,<4.2"
+      - name: Install Django 4.2
+        if: matrix.django == 4.2
+        run: pip install "Django>=4.2,<5.0"
+      - name: Install Django 5.0
+        if: matrix.django == 5.0
+        run: pip install "Django>=5.0,<5.1"
+      - name: Install Django 5.1
+        if: matrix.django == 5.1
+        run: pip install "Django>=5.1,<5.2"
       - name: Install MySQL libs
         if: matrix.database == 'mysql'
-        run: pip install mysqlclient>=2.0.1 django-mysql>=3.9.0
+        run: pip install mysqlclient>=2.2.4 django-mysql>=4.14.0
       - name: Install postgres libs
         if: matrix.database == 'postgres'
-        run: pip install psycopg2-binary>=2.8.6
+        run: pip install psycopg2-binary>=2.9.9
 
       - name: Install Django ReST framework libraries
         run: pip install -U django-rest-framework rest-framework-generic-relations drf-spectacular
 
-
       # install our package
       - name: Install package
         run: pip install -e .

actstream/actions.py

@@ -125,8 +125,12 @@ def action_handler(verb, **kwargs):
 
     # We must store the untranslated string
     # If verb is an ugettext_lazyed string, fetch the original string
+    # _proxy____args is a valid attribute in Django <= 4.2
     if hasattr(verb, '_proxy____args'):
         verb = verb._proxy____args[0]
+    # _args is the new attribute in Django >= 5.0
+    elif hasattr(verb, '_args'):
+        verb = verb._args[0]
 
     newaction = settings.get_action_model()(
         actor_content_type=ContentType.objects.get_for_model(actor),

docs/changelog.rst

@@ -6,7 +6,10 @@ Changelog
 2.0.1
 -----
 
-  - Custom Action and Follow models support
+  - Added support for custom Action and Follow models
+  - Added support for Django 5.0 and 5.1
+  - Added support for Python 3.10, 3.11 and 3.12
+  - Updated GitHub actions
 
 2.0.0
 -----

docs/installation.rst

@@ -60,7 +60,7 @@ Make sure to pick the version of Django and django-activity-stream that supports
 Python
 ******
 
-* **Python 3**: 3.6 to 3.9
+* **Python 3**: 3.8 to 3.12
 * **PyPy**: 3
 
 Django

tox.ini

@@ -1,8 +1,11 @@
 [tox]
 envlist =
-    py{37,38,39}-django32-{mysql,postgres,sqlite}
-    py{38,39}-django40-{mysql,postgres,sqlite}
-    py{38,39}-django41-{mysql,postgres,sqlite}
+    py{38,39,310}-django32-{mysql,postgres-psycopg2,sqlite}
+    py{38,39,310}-django40-{mysql,postgres-psycopg2,sqlite}
+    py{38,39,310,311}-django41-{mysql,postgres-psycopg2,sqlite}
+    py{38,39,310,311,312}-django42-{mysql,postgres-psycopg3,sqlite}
+    py{310,311,312}-django50-{mysql,postgres-psycopg3,sqlite}
+    py{310,311,312}-django51-{mysql,postgres-psycopg3,sqlite}
 toxworkdir=/tmp/.tox
 
 [testenv]
@@ -20,17 +23,34 @@ deps =
     django32: Django>=3.2,<4.0
     django40: Django>=4.0,<4.1
     django41: Django>=4.1,<4.2
+    django42: Django>=4.2,<5.0
+    django50: Django>=5.0,<5.1
+    django51: Django>=5.1,<5.2
     mysql: mysqlclient>=2.0.0
     mysql: django-mysql>=2.4.1
-    postgres: psycopg2-binary>=2.8
+    postgres-psycopg2: psycopg2-binary>=2.8
+    postgres-psycopg3: psycopg-binary>=3.2
 
 setenv =
     ; GITHUB_WORKFLOW=true ; Set this to force enable mysql/postgres dbs
     mysql: DATABASE_ENGINE=mysql
-    postgres: DATABASE_ENGINE=postgresql
+    postgres-psycopg2: DATABASE_ENGINE=postgresql
+    postgres-psycopg3: DATABASE_ENGINE=postgresql
 
 ; Pass this to force enable mysql/postgres dbs
-passenv = GITHUB_WORKFLOW MYSQL_HOST MYSQL_NAME MYSQL_USER MYSQL_PASSWORD MYSQL_PORT POSTGRES_HOST POSTGRES_NAME POSTGRES_PORT POSTGRES_USER POSTGRES_PASSWORD SQLITE_NAME
+passenv =
+    GITHUB_WORKFLOW
+    MYSQL_HOST
+    MYSQL_NAME
+    MYSQL_USER
+    MYSQL_PASSWORD
+    MYSQL_PORT
+    POSTGRES_HOST
+    POSTGRES_NAME
+    POSTGRES_PORT
+    POSTGRES_USER
+    POSTGRES_PASSWORD
+    SQLITE_NAME
 
 usedevelop = True
 
@@ -47,10 +67,14 @@ commands =
 
 [travis:env]
 DJANGO =
+    5.1: django51
+    5.0: django50
+    4.2: django42
+    4.1: django41
     4.0: django40
     3.2: django32
 DATABASE =
     mysql: mysql
-    postgresql: postgresql
+    postgres-psycopg2: postgresql
+    postgres-psycopg3: postgresql
     sqlite: sqlite
-