Add support for dj32

.github/workflows/ci.yml

@@ -48,23 +48,39 @@ jobs:
       - name: Install test tools
         run: pip install tox coverage
 
-      - name: Flake8
-        run: pip install flake8 && flake8
-
       - name: Run SQLite tests
-        run: tox -e dj-31-db-sqlite
+        run: tox
 
       - name: Run Postgres tests
         env:
           DATABASE_URL: postgres://postgres:changeme@localhost:5432/test
-        run: tox -e dj-31-db-pg
+        run: tox
 
       - name: Run MariaDB tests
         env:
           DATABASE_URL: mysql://root:@127.0.0.1:13306/test
         run: |
           /usr/bin/mysql --host=127.0.0.1 --port=13306 --user=root --execute "SHOW DATABASES;"
-          tox -e dj-31-db-maria
+          tox
 
       - name: Coverage report
-        run: coverage report -m
+        run: |
+          coverage report -m
+          coverage lcov -o ./coverage/lcov.info
+
+      - name: Coveralls Parallel
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.github_token }}
+          flag-name: run-${{ matrix.test_number }}
+          parallel: true
+
+  public-coveralls:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: Publish to Coveralls.io
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ secrets.github_token }}
+        parallel-finished: true

dev/README.md

@@ -0,0 +1,26 @@
+* Start the dev environment (including Postgres & MariaDB databases) with:
+
+    ```
+    docker-compose up
+    ```
+
+* After you have started the dev stack, start the tests with:
+
+    ```
+    docker-compose exec dev tox
+    ```
+
+* Relock with 
+
+    ```
+    docker-compose run dev poetry relock
+    ```
+
+* Testing using script and tox (so you don't have to remember the db urls):
+
+
+    -e is the tox environment to run - eg. dj-31, dj-32 or dj-40
+    -PSM are optional flags to run for Postgres, SQLite, MariaDB
+    ```
+    ./dev/local-test.sh -e dj-31 -PSM
+    ```

dev/docker-compose.yml

@@ -21,7 +21,6 @@ services:
     environment:
       - PYTHONPATH=/usr/src/app:/usr/src/app/tests/
       - DJANGO_SETTINGS_MODULE=library_app.settings
-    image: python
     # env_file:
     #   - default.env
     #   - .env

dev/local-test.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+# A little script to run on the different dev databases
+RUN_PG=0
+RUN_SQLITE=0
+RUN_MARIA=0
+
+while getopts e:PSM flag
+do
+    case "${flag}" in
+        e) TOX_ENV=${OPTARG};;
+        P) RUN_PG=1;;
+        S) RUN_SQLITE=1;;
+        M) RUN_MARIA=1;;
+    esac
+done
+
+if [ $RUN_SQLITE -eq 1 ]
+then
+    echo "Testing with SQLLite"
+    tox -e ${TOX_ENV} # Sqlite
+fi
+
+if [ $RUN_MARIA -eq 1 ]
+then
+    echo "Testing with MariaDB"
+    DATABASE_URL=mysql://root:@maria_db:13306/test tox -e ${TOX_ENV}
+fi
+
+if [ $RUN_PG -eq 1 ]
+then
+    echo "Testing with Postgres"
+    DATABASE_URL=postgres://postgres:changeme@postgres_db:5432/test tox -e ${TOX_ENV} # Sqlite
+fi
+

garnett/expressions.py

@@ -1,24 +1,22 @@
 from django.db.models import F
 from django.db.models.fields.json import KeyTextTransform
 
-from garnett.utils import get_current_language
+from garnett.utils import get_current_language_code
 from garnett.fields import TranslatedField
 
 
 # Based on: https://code.djangoproject.com/ticket/29769#comment:5
 # Updated comment here
 # https://code.djangoproject.com/ticket/31639
 class LangF(F):
-    def resolve_expression(
-        self, query=None, allow_joins=True, reuse=None, summarize=False, for_save=False
-    ):
-        rhs = super().resolve_expression(query, allow_joins, reuse, summarize, for_save)
+    def resolve_expression(self, *args, **kwargs):
+        rhs = super().resolve_expression(*args, **kwargs)
         if isinstance(rhs.field, TranslatedField):
             field_list = self.name.split("__")
             # TODO: should this always lookup lang
             if len(field_list) == 1:
                 # Lookup current lang for one field
-                field_list.extend([get_current_language()])
+                field_list.extend([get_current_language_code()])
             for name in field_list[1:]:
                 # Perform key lookups along path
                 rhs = KeyTextTransform(name, rhs)
@@ -30,4 +28,4 @@ class L(KeyTextTransform):
     """Expression to return the current language"""
 
     def __init__(self, *args, **kwargs):
-        super().__init__(get_current_language(), *args, **kwargs)
+        super().__init__(get_current_language_code(), *args, **kwargs)

garnett/fields.py

@@ -246,7 +246,7 @@ def available_languages(ego):
             langs = set()
             for field in ego.translatable_fields:
                 langs |= getattr(ego, field.ts_name, {}).keys()
-            return [lang for lang in get_languages() if lang.language in langs]
+            return [lang for lang in get_languages() if lang.to_tag() in langs]
 
         setattr(cls, "available_languages", available_languages)
 

garnett/lookups.py

@@ -1,7 +1,7 @@
 from django.db.models import lookups
 from django.db.models.fields import json, CharField
 from django.db.models.functions import Cast
-from django.contrib.postgres.fields.jsonb import KeyTextTransform
+from django.db.models.fields.json import KeyTextTransform
 from django.contrib.postgres.lookups import SearchLookup, TrigramSimilar
 from django.contrib.postgres.search import TrigramSimilarity