Merge branch 'django-4.2' of 'https://github.com/jjmerchante/grimoire…

…lab-sortinghat'

Merges #879
Closes #879

.github/workflows/release.yml

@@ -82,8 +82,8 @@ jobs:
         run: |
           PACKAGE=`(cd dist && ls *whl)` && echo $PACKAGE
           poetry run pip install --pre ./dist/$PACKAGE
-          poetry run python manage.py test --settings=config.settings.testing
-          poetry run python manage.py test --settings=config.settings.testing_tenant
+          poetry run python manage.py test --settings=config.settings.config_testing
+          poetry run python manage.py test --settings=config.settings.config_testing_tenant
 
   release:
     needs: [tests]

.github/workflows/tests.yml

@@ -55,8 +55,8 @@ jobs:
         poetry run flake8
     - name: Tests
       run: |
-        poetry run python manage.py test --settings=config.settings.testing
-        poetry run python manage.py test --settings=config.settings.testing_tenant
+        poetry run python manage.py test --settings=config.settings.config_testing
+        poetry run python manage.py test --settings=config.settings.config_testing_tenant
 
   frontend:
 

README.md

@@ -18,7 +18,7 @@ In the context of GrimoireLab, Sorting Hat is usually run after data is retrieve
 * Python >= 3.8
 * Poetry >= 1.1.0
 * MySQL >= 5.7 or MariaDB 10.0
-* Django = 3.2
+* Django = 4.2
 * Graphene-Django >= 2.0
 * uWSGI >= 2.0
 
@@ -70,7 +70,7 @@ $ apt install libmariadbclient-dev-compat
 **Note**: these examples use `sortinghat.config.settings` configuration file.
 In order to use that configuration you need to define the environment variable
 `SORTINGHAT_SECRET_KEY` with a secret. More info here:
-https://docs.djangoproject.com/en/3.2/ref/settings/#std:setting-SECRET_KEY
+https://docs.djangoproject.com/en/4.2/ref/settings/#std:setting-SECRET_KEY
 
 
 Install the required dependencies (this will also create a virtual environment).
@@ -285,8 +285,8 @@ frontend and backend.
 
 #### Backend test suite
 ```
-(.venv)$ ./manage.py test --settings=config.settings.testing
-(.venv)$ ./manage.py test --settings=config.settings.testing_tenant
+(.venv)$ ./manage.py test --settings=config.settings.config_testing
+(.venv)$ ./manage.py test --settings=config.settings.config_testing_tenant
 ```
 
 #### Frontend test suite

config/settings/testing_tenant.py → config/settings/config_testing_tenant.py

@@ -1,5 +1,5 @@
-from .testing import *  # noqa: F403,F401
-from .testing import SQL_MODE, DATABASES, RQ_QUEUES
+from .config_testing import *  # noqa: F403,F401
+from .config_testing import SQL_MODE, DATABASES, RQ_QUEUES
 
 tenants_cfg = [
     {'name': 'tenant_1', 'dedicated_queue': True},

pyproject.toml

@@ -52,7 +52,7 @@ sortinghat-admin = "sortinghat.server.sortinghat_admin:sortinghat_admin"
 python = "^3.8"
 
 click = "7.1.1"
-Django = "^3.2"
+Django = "^4.2"
 django-graphql-jwt = "^0.3.0"
 graphene-django = "^2.15"
 sgqlc = "^16.1"

releases/unreleased/django-version-updated.yml

@@ -0,0 +1,10 @@
+---
+title: Django version updated
+category: dependency
+author: Jose Javier Merchante <jjmerchante@bitergia.com>
+issue: null
+notes: >
+  Upgrade the Django version from 3.2 to 4.2. Support for
+  Django 3.2 ended at April 1, 2024. This change ensures
+  compability with the latests features and an extended
+  support.

sortinghat/config/settings.py

@@ -174,7 +174,7 @@
 #
 # Static files (CSS, JavaScript, Images)
 #
-# https://docs.djangoproject.com/en/3.2/howto/static-files/
+# https://docs.djangoproject.com/en/4.2/howto/static-files/
 #
 
 STATIC_URL = '/'
@@ -209,7 +209,6 @@
 
 LANGUAGE_CODE = 'en-us'
 USE_I18N = True
-USE_L10N = True
 
 #
 # Time Zone

sortinghat/core/migrations/0001_sortinghat.py

@@ -3,7 +3,6 @@
 import datetime
 from django.db import migrations, models
 import django.db.models.deletion
-from django.utils.timezone import utc
 import grimoirelab_toolkit.datetime
 import sortinghat.core.models
 
@@ -210,8 +209,8 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('created_at', sortinghat.core.models.CreationDateTimeField(default=grimoirelab_toolkit.datetime.datetime_utcnow, editable=False)),
                 ('last_modified', sortinghat.core.models.LastModificationDateTimeField(default=grimoirelab_toolkit.datetime.datetime_utcnow, editable=False)),
-                ('start', models.DateTimeField(default=datetime.datetime(1900, 1, 1, 0, 0, tzinfo=utc))),
-                ('end', models.DateTimeField(default=datetime.datetime(2100, 1, 1, 0, 0, tzinfo=utc))),
+                ('start', models.DateTimeField(default=datetime.datetime(1900, 1, 1, 0, 0, tzinfo=datetime.timezone.utc))),
+                ('end', models.DateTimeField(default=datetime.datetime(2100, 1, 1, 0, 0, tzinfo=datetime.timezone.utc))),
                 ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='enrollments', to='core.group')),
                 ('individual', models.ForeignKey(db_column='mk', on_delete=django.db.models.deletion.CASCADE, related_name='enrollments', to='core.individual')),
             ],

sortinghat/core/schema.py

@@ -1100,7 +1100,7 @@ class Arguments:
 
     job_id = graphene.Field(lambda: graphene.String)
 
-    @check_permissions('core.execute_job')
+    @check_permissions(['core.execute_job'])
     @check_auth
     def mutate(self, info, uuids=None, last_modified=MIN_PERIOD_DATE):
         user = info.context.user
@@ -1131,7 +1131,7 @@ class Arguments:
 
     job_id = graphene.Field(lambda: graphene.String)
 
-    @check_permissions('core.execute_job')
+    @check_permissions(['core.execute_job'])
     @check_auth
     def mutate(self, info, criteria,
                source_uuids=None, target_uuids=None,
@@ -1166,7 +1166,7 @@ class Arguments:
 
     job_id = graphene.Field(lambda: graphene.String)
 
-    @check_permissions('core.execute_job')
+    @check_permissions(['core.execute_job'])
     @check_auth
     def mutate(self, info, uuids=None, exclude=True, no_strict_matching=False):
         user = info.context.user
@@ -1191,7 +1191,7 @@ class Arguments:
 
     job_id = graphene.Field(lambda: graphene.String)
 
-    @check_permissions('core.execute_job')
+    @check_permissions(['core.execute_job'])
     @check_auth
     def mutate(self, info, uuids=None, last_modified=MIN_PERIOD_DATE):
         user = info.context.user
@@ -1221,7 +1221,7 @@ class Arguments:
 
     job_id = graphene.Field(lambda: graphene.String)
 
-    @check_permissions('core.execute_job')
+    @check_permissions(['core.execute_job'])
     @check_auth
     def mutate(self, info, criteria,
                source_uuids=None, target_uuids=None,
@@ -1256,7 +1256,7 @@ class Arguments:
 
     job_id = graphene.Field(lambda: graphene.String)
 
-    @check_permissions('core.execute_job')
+    @check_permissions(['core.execute_job'])
     @check_auth
     def mutate(self, info, uuids=None, exclude=True, no_strict_matching=False):
         user = info.context.user

tests/tenants/test_jobs.py

@@ -195,7 +195,7 @@ def test_default_tenant_queue(self):
     def test_not_found_queue(self):
         """Check it an error is raised when the queue is not found"""
 
-        # The configuration in settings.testing_tenant ignores
+        # The configuration in settings.config_testing_tenant ignores
         # the creation of this queue, so it should raise an error.
         with self.assertRaisesRegex(JobError, "Queue 'error_tenant' not found."):
             jobs.get_tenant_queue('error_tenant')

tests/test_schema.py

@@ -107,7 +107,6 @@
                                   " for Example not found in the registry"
 PAGINATION_NO_RESULTS_ERROR = "That page contains no results"
 PAGINATION_PAGE_LESS_THAN_ONE_ERROR = "That page number is less than 1"
-PAGINATION_PAGE_SIZE_NEGATIVE_ERROR = "Negative indexing is not supported."
 PAGINATION_PAGE_SIZE_ZERO_ERROR = "division by zero"
 AUTHENTICATION_ERROR = "You do not have permission to perform this action"
 PARSE_DATE_INVALID_DATE_ERROR = "{} is not a valid date"
@@ -1418,7 +1417,7 @@ def test_page_size_negative(self):
                                   context_value=self.context_value)
 
         msg = executed['errors'][0]['message']
-        self.assertEqual(msg, PAGINATION_PAGE_SIZE_NEGATIVE_ERROR)
+        self.assertEqual(msg, PAGINATION_NO_RESULTS_ERROR)
 
     def test_page_size_zero(self):
         """Check if it fails when `pageSize` is set to `0`"""