LITE-27076 Added support for Django 4.2

* Fixed documentation building and updated README badges

Author: maxipavlovic

.github/workflows/build.yml

@@ -37,12 +37,12 @@ jobs:
       - name: Testing
         run: |
           poetry run pytest
-  build_3_10_django_4_0:
-    name: Build on Python 3.10 django 4.0
+  build_3_11_django_4_2:
+    name: Build on Python 3.11 django 4.2
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.10']
+        python-version: ['3.11']
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -57,7 +57,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install poetry
           poetry install
-          poetry run pip install django==4.0.*
+          poetry run pip install django==4.2.*
       - name: Linting
         run: |
           poetry run flake8
@@ -93,7 +93,7 @@ jobs:
           poetry run pytest
   sonar:
     name: Sonar Checks
-    needs: [build_3_8_9_10_11_django_3_2, build_3_10_django_4_0, build_3_10_django_4_1]
+    needs: [build_3_8_9_10_11_django_3_2, build_3_11_django_4_2, build_3_10_django_4_1]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -109,7 +109,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install poetry
           poetry install
-          poetry run pip install django==4.0.*
+          poetry run pip install django==4.2.*
       - name: Testing
         run: |
           poetry run pytest

README.md

@@ -1,13 +1,14 @@
 Django CQRS
 ===========
 ![pyversions](https://img.shields.io/pypi/pyversions/django-cqrs.svg)
-[![PyPi Status](https://img.shields.io/pypi/v/django-cqrs.svg)](https://pypi.org/project/django-cqrs/)
+![PyPI](https://img.shields.io/pypi/v/django-cqrs)
 [![Docs](https://readthedocs.org/projects/django-cqrs/badge/?version=latest)](https://readthedocs.org/projects/django-cqrs)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=django-cqrs&metric=coverage)](https://sonarcloud.io/dashboard?id=django-cqrs)
-[![Build Status](https://travis-ci.org/cloudblue/django-cqrs.svg?branch=master)](https://travis-ci.org/cloudblue/django-cqrs)
+![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/cloudblue/django-cqrs/build.yml)
 [![PyPI status](https://img.shields.io/pypi/status/django-cqrs.svg)](https://pypi.python.org/pypi/django-cqrs/)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=django-cqrs&metric=alert_status)](https://sonarcloud.io/dashboard?id=django-cqrs)
 [![PyPI Downloads](https://img.shields.io/pypi/dm/django-cqrs)](https://pypi.org/project/django-cqrs/)
+![GitHub](https://img.shields.io/github/license/cloudblue/django-cqrs)
 
 `django-cqrs` is an Django application, that implements CQRS data synchronisation between several Django microservices.
 

dj_cqrs/transport/rabbit_mq.py

@@ -113,6 +113,7 @@ def _produce_with_retries(cls, payload, retries):
             exceptions.ChannelError,
             exceptions.ReentrancyError,
             AMQPConnectorException,
+            AssertionError,
         ) as e:
             # in case of any error - close connection and try to reconnect
             cls.clean_connection()

integration_tests/rdbms.yml

@@ -33,5 +33,5 @@ services:
       bash -c '
         dockerize -wait tcp://postgres:5432 -timeout 50s &&
         dockerize -wait tcp://mysql:3306 -timeout 50s &&
-        pytest
+        pytest -v
       '

poetry.lock

@@ -15,6 +15,7 @@ classifiers = [
     'Framework :: Django :: 3.2',
     'Framework :: Django :: 4.0',
     'Framework :: Django :: 4.1',
+    'Framework :: Django :: 4.2',
     'Intended Audience :: Developers',
     'License :: OSI Approved :: Apache Software License',
     'Operating System :: Unix',
@@ -45,11 +46,10 @@ python-dateutil = ">=2.4"
 watchfiles = "^0.18.1"
 
 [tool.poetry.group.test.dependencies]
-pytest = ">=6.1.2,<8"
+pytest = ">=7.2.0,<8"
 pytest-cov = ">=2.10.1,<5"
 pytest-mock = "^3.3.1"
 pytest-django = ">=4.4.0"
-pytest-pythonpath = { version = "^0.7.4", python = "<3.8" }
 pytest-randomly = ">=3.12"
 pytest-deadfixtures = "^2.2.1"
 coverage = {extras = ["toml"], version = ">=5.3,<7"}
@@ -86,7 +86,6 @@ python_files = "test_*.py"
 DJANGO_SETTINGS_MODULE = "tests.dj.settings"
 django_find_project = false
 pythonpath = [".", "src"]
-python_paths = ["."]
 
 [tool.coverage.xml]
 output = "tests/reports/coverage.xml"
@@ -102,3 +101,7 @@ use_parentheses = true
 include_trailing_comma = true
 line_length = 100
 lines_after_imports = 2
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"

pyproject.toml

@@ -1,5 +1,8 @@
+#  Copyright © 2023 Ingram Micro Inc. All rights reserved.
+
 from copy import deepcopy
 
+import django
 import pytest
 
 
@@ -14,3 +17,8 @@ def restore_cqrs_settings(settings):
         settings.CQRS = deepcopy(settings.CQRS)
 
     yield
+
+
+@pytest.fixture()
+def django_v_trans_q_count_sup():
+    return 2 if django.get_version() >= '4.2' else 0

tests/conftest.py

@@ -63,13 +63,6 @@ def change_data(*args, **kwargs):
     assert payload.previous_data == {'previous_key': 'initial previous'}
 
 
-@pytest.mark.django_db(transaction=True)
-def test_route_signal_to_replica_model_with_db(django_assert_num_queries):
-    query_counter = 0 if settings.DB_ENGINE == 'postgres' else 1
-    with django_assert_num_queries(query_counter):
-        route_signal_to_replica_model(SignalType.SAVE, 'lock', {})
-
-
 @pytest.mark.django_db(transaction=True)
 def test_route_signal_to_replica_model_integrity_error(caplog):
     instance_data = {

tests/test_controller.py

@@ -387,17 +387,21 @@ def test_serialization_no_related_instance(mocker):
 
 
 @pytest.mark.django_db(transaction=True)
-def test_save_serialization(mocker, django_assert_num_queries):
+def test_save_serialization(mocker, django_assert_num_queries, django_v_trans_q_count_sup):
     publisher_mock = mocker.patch('dj_cqrs.controller.producer.produce')
 
+    # < Django 4.2
     # 0 - Transaction start (SQLite only)
     # 1 - Publisher
     # 2 - Author
     # 3-4 - Books
     # 5-6 - Serialization with prefetch_related
-    query_counter = 7 if settings.DB_ENGINE == 'sqlite' else 6
+    query_counter = 6 + django_v_trans_q_count_sup
+    if settings.DB_ENGINE == 'sqlite' and django_v_trans_q_count_sup == 0:
+        query_counter = 7
+
     with django_assert_num_queries(query_counter):
-        with transaction.atomic():
+        with transaction.atomic(savepoint=False):
             publisher = models.Publisher.objects.create(id=1, name='publisher')
             author = models.Author.objects.create(id=1, name='author', publisher=publisher)
             for index in range(1, 3):

tests/test_master/test_mixin.py

@@ -173,7 +173,7 @@ def rabbit_transport(settings):
 
 
 @pytest.mark.parametrize(
-    'exception', (AMQPError, ChannelError, ReentrancyError, AMQPConnectorException),
+    'exception', (AMQPError, ChannelError, ReentrancyError, AMQPConnectorException, AssertionError),
 )
 def test_produce_connection_error(exception, rabbit_transport, mocker, caplog):
     mocker.patch.object(RabbitMQTransport, '_get_producer_rmq_objects', side_effect=exception)