Django 1.10

.github/workflows/main.yml

@@ -5,7 +5,6 @@ name: CI
 #                push or pull request events but only for the ng branch
 on:
   push:
-    branches: [ ng ]
   pull_request:
     branches: [ ng ]
 

requirements/base.txt

@@ -1,22 +1,21 @@
 -r openstack.txt
 -r hermes.txt
-Django==1.8.19
+Django==1.10.8
 dj.choices==0.11.0
 django-extensions==1.7.5
 django-filter==0.13.0
-django-import-export==0.4.2
-django-money==0.15.1
+django-import-export==1.2.0
+django-money==0.12
 py-moneyed==1.2
 django-mptt==0.8.7
-django-reversion==1.8.6
+django-reversion==2.0
 django-rq==2.0
 django-sitetree==1.7.0
-django-taggit==0.17.1
-django-taggit-serializer==0.1.5
+django-taggit==0.22.2
+django-taggit-serializer==0.1.7
 django-threadlocals==0.8
-django-transaction-hooks==0.2  # it's merged to Django 1.9 - remove this when Django version will be bumped to 1.9
 django-cryptography==0.3
-djangorestframework==3.2.2
+djangorestframework==3.4.0
 djangorestframework_xml==1.2.0
 drf-nested-routers==0.11.1
 Markdown<3.0  # headerid extension removed in 3.0 - see #3313 for details
@@ -37,4 +36,3 @@ Faker==0.9.0
 openpyxl==2.4.0
 typing==3.6.6
 Pillow==6.2.2
-

requirements/code_style.txt

@@ -1,2 +1,3 @@
 flake8==3.0.4
-isort==4.2.5
+isort==4.2.5
+pyflakes==1.5.0

src/ralph/access_cards/admin.py

@@ -1,7 +1,8 @@
 from django.utils.translation import ugettext_lazy as _
 
 from ralph.access_cards.models import AccessCard, AccessZone
-from ralph.admin import RalphAdmin, RalphMPTTAdmin, register
+from ralph.admin.decorators import register
+from ralph.admin.mixins import RalphAdmin, RalphMPTTAdmin
 from ralph.lib.transitions.admin import TransitionAdminMixin
 
 

src/ralph/accessories/admin.py

@@ -1,7 +1,8 @@
 from django.utils.translation import ugettext_lazy as _
 
 from ralph.accessories.models import Accessory, AccessoryUser
-from ralph.admin import RalphAdmin, RalphTabularInline, register
+from ralph.admin.decorators import register
+from ralph.admin.mixins import RalphAdmin, RalphTabularInline
 from ralph.admin.views.extra import RalphDetailViewAdmin
 from ralph.lib.transitions.admin import TransitionAdminMixin
 

src/ralph/accessories/models.py

@@ -1,4 +1,3 @@
-import reversion
 from dj.choices import Choices
 from django import forms
 from django.conf import settings
@@ -8,6 +7,7 @@
 from django.utils.functional import cached_property
 from django.utils.translation import ugettext_lazy as _
 from mptt.fields import TreeForeignKey
+from reversion import revisions as reversion
 
 from ralph.accounts.models import RalphUser, Regionalizable
 from ralph.assets.models import Category, Manufacturer
@@ -18,6 +18,7 @@
 from ralph.lib.transitions.fields import TransitionField
 from ralph.lib.transitions.models import TransitionWorkflowBaseWithPermissions
 
+
 _SELECT_USED_ACCESSORY_QUERY = """
     SELECT COALESCE(SUM({assignment_table}.{quantity_column}), 0)
     FROM {assignment_table}

src/ralph/accounts/admin.py

@@ -12,14 +12,15 @@
 from django.forms.models import model_to_dict
 from django.utils.functional import cached_property
 from django.utils.translation import ugettext_lazy as _
+from reversion import revisions as reversion
 
 from ralph.accounts.models import RalphUser, Region, Team
-from ralph.admin import RalphAdmin, register
+from ralph.admin.decorators import register
 from ralph.admin.helpers import getattr_dunder
-from ralph.admin.mixins import RalphAdminFormMixin
+from ralph.admin.mixins import RalphAdmin, RalphAdminFormMixin
 from ralph.admin.views.extra import RalphDetailView
 from ralph.back_office.models import BackOfficeAsset, BackOfficeAssetStatus
-from ralph.lib.table import Table
+from ralph.lib.table.table import Table
 from ralph.lib.transitions.models import TransitionsHistory
 from ralph.licences.models import Licence
 from ralph.sim_cards.models import SIMCard
@@ -338,8 +339,8 @@ def user_change_password(self, request, id, form_url=''):
 
         if not self.has_change_permission(request, obj=user):
             raise PermissionDenied
-
-        return super().user_change_password(request, id, form_url)
+        with reversion.create_revision():
+            return super().user_change_password(request, id, form_url)
 
 
 @register(Group)

src/ralph/accounts/ldap.py

@@ -7,9 +7,6 @@
 from django.dispatch import receiver
 from django.utils.encoding import force_text
 from django_auth_ldap.backend import _LDAPUser, LDAPSettings, populate_user
-from django_auth_ldap.config import ActiveDirectoryGroupType
-
-from ralph.accounts.management.commands.ldap_sync import get_nested_groups
 
 logger = logging.getLogger(__name__)
 
@@ -102,87 +99,3 @@ def manager_country_attribute_populate(
                 user.country = Country.id_from_name(country.lower())
             except ValueError:
                 user.country = None
-
-
-class MappedGroupOfNamesType(ActiveDirectoryGroupType):
-    """Provide group mappings described in project settings."""
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self._ldap_groups = None
-
-    @property
-    def ldap_groups(self):
-        """
-        Composition of flat LDAP groups (taken from `AUTH_LDAP_GROUP_MAPPING`)
-        and nested groups (taken from `AUTH_LDAP_NESTED_GROUPS`).
-
-        Returns: dict with both flat and nested LDAP groups.
-        """
-        if not self._ldap_groups:
-            logger.debug('Evaluating LDAP groupd from settings')
-            self._ldap_flat_groups = getattr(
-                settings, 'AUTH_LDAP_GROUP_MAPPING', {}
-            )
-            self._ldap_nested_groups = getattr(
-                settings, 'AUTH_LDAP_NESTED_GROUPS', {}
-            )
-            self._ldap_groups = self._ldap_flat_groups.copy()
-            self._ldap_groups.update(self._ldap_nested_groups)
-        return self._ldap_groups
-
-    def _get_group(self, group_dn, ldap_user, group_search):
-        base_dn = group_search.base_dn
-        group_search.base_dn = force_text(group_dn)
-        group = group_search.execute(ldap_user.connection)[0]
-        group_search.base_dn = base_dn
-        return group
-
-    def user_groups(self, ldap_user, group_search):
-        """Get groups which user belongs to."""
-        group_map = []
-
-        def handle_groups(groups_dns):
-            """
-            Compare user groups with groups accepted by Ralph
-            (`self.ldap_groups`) and for each in common get LDAP group
-
-            Args:
-                groups_dns: set of user groups DNs
-            """
-            for group_dn in groups_dns & set(self.ldap_groups.keys()):
-                group = self._get_group(group_dn, ldap_user, group_search)
-                group_map.append(group)
-
-        username = ldap_user.attrs[settings.AUTH_LDAP_USER_USERNAME_ATTR][0]
-
-        # handle flat groups first (to which user belongs directly)
-        try:
-            flat_groups_dns = set(map(force_text, ldap_user.attrs['memberOf']))
-        except KeyError:
-            flat_groups_dns = set()
-        logger.info('Flat groups DNs for {}: {}'.format(
-            username, flat_groups_dns
-        ))
-        handle_groups(flat_groups_dns)
-
-        # handle nested groups
-        nested_groups_dns = get_nested_groups()[1].get(username, set())
-        logger.info('Nested groups DNs for {}: {}'.format(
-            username, nested_groups_dns
-        ))
-        handle_groups(nested_groups_dns)
-        return group_map
-
-    def group_name_from_info(self, group_info):
-        """Map ldap group names into ralph names if mapping defined."""
-        if self.ldap_groups:
-            for dn in group_info[1]['distinguishedname']:
-                mapped = self.ldap_groups.get(dn)
-                if mapped:
-                    return mapped
-        # return original name if mapping not defined
-        else:
-            return super(
-                MappedGroupOfNamesType,
-                self
-            ).group_name_from_info(group_info)

src/ralph/accounts/ldap_helpers.py

@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+import logging
+
+from django.conf import settings
+from django.utils.encoding import force_text
+from django_auth_ldap.config import ActiveDirectoryGroupType
+
+
+logger = logging.getLogger(__name__)
+
+
+class MappedGroupOfNamesType(ActiveDirectoryGroupType):
+    """Provide group mappings described in project settings."""
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._ldap_groups = None
+
+    @property
+    def ldap_groups(self):
+        """
+        Composition of flat LDAP groups (taken from `AUTH_LDAP_GROUP_MAPPING`)
+        and nested groups (taken from `AUTH_LDAP_NESTED_GROUPS`).
+
+        Returns: dict with both flat and nested LDAP groups.
+        """
+        if not self._ldap_groups:
+            logger.debug('Evaluating LDAP groupd from settings')
+            self._ldap_flat_groups = getattr(
+                settings, 'AUTH_LDAP_GROUP_MAPPING', {}
+            )
+            self._ldap_nested_groups = getattr(
+                settings, 'AUTH_LDAP_NESTED_GROUPS', {}
+            )
+            self._ldap_groups = self._ldap_flat_groups.copy()
+            self._ldap_groups.update(self._ldap_nested_groups)
+        return self._ldap_groups
+
+    def _get_group(self, group_dn, ldap_user, group_search):
+        base_dn = group_search.base_dn
+        group_search.base_dn = force_text(group_dn)
+        group = group_search.execute(ldap_user.connection)[0]
+        group_search.base_dn = base_dn
+        return group
+
+    def user_groups(self, ldap_user, group_search):
+        """Get groups which user belongs to."""
+        group_map = []
+
+        def handle_groups(groups_dns):
+            """
+            Compare user groups with groups accepted by Ralph
+            (`self.ldap_groups`) and for each in common get LDAP group
+
+            Args:
+                groups_dns: set of user groups DNs
+            """
+            for group_dn in groups_dns & set(self.ldap_groups.keys()):
+                group = self._get_group(group_dn, ldap_user, group_search)
+                group_map.append(group)
+
+        username = ldap_user.attrs[settings.AUTH_LDAP_USER_USERNAME_ATTR][0]
+
+        # handle flat groups first (to which user belongs directly)
+        try:
+            flat_groups_dns = set(map(force_text, ldap_user.attrs['memberOf']))
+        except KeyError:
+            flat_groups_dns = set()
+        logger.info('Flat groups DNs for {}: {}'.format(
+            username, flat_groups_dns
+        ))
+        handle_groups(flat_groups_dns)
+        from ralph.accounts.management.commands.ldap_sync import get_nested_groups  # noqa
+        # handle nested groups
+        nested_groups_dns = get_nested_groups()[1].get(username, set())
+        logger.info('Nested groups DNs for {}: {}'.format(
+            username, nested_groups_dns
+        ))
+        handle_groups(nested_groups_dns)
+        return group_map
+
+    def group_name_from_info(self, group_info):
+        """Map ldap group names into ralph names if mapping defined."""
+        if self.ldap_groups:
+            for dn in group_info[1]['distinguishedname']:
+                mapped = self.ldap_groups.get(dn)
+                if mapped:
+                    return mapped
+        # return original name if mapping not defined
+        else:
+            return super(
+                MappedGroupOfNamesType,
+                self
+            ).group_name_from_info(group_info)

src/ralph/accounts/migrations/0007_auto_20240506_1128.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2024-05-06 11:28
+from __future__ import unicode_literals
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0006_remove_ralphuser_gender'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ralphuser',
+            name='username',
+            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=30, unique=True, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.')], verbose_name='username'),
+        ),
+    ]

src/ralph/accounts/migrations/0008_auto_20240507_1422.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.1 on 2024-05-07 14:22
+from __future__ import unicode_literals
+
+import django.contrib.auth.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0007_auto_20240506_1128'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ralphuser',
+            name='username',
+            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username'),
+        ),
+    ]

src/ralph/accounts/models.py

@@ -13,7 +13,7 @@
 
 from ralph.admin.autocomplete import AutocompleteTooltipMixin
 from ralph.lib.mixins.models import AdminAbsoluteUrlMixin, NamedMixin
-from ralph.lib.permissions import (
+from ralph.lib.permissions.models import (
     PermByFieldMixin,
     PermissionsForObjectMixin,
     user_permission
@@ -164,12 +164,10 @@ def has_any_perms(self, perms, obj=None):
         return any([self.has_perm(p, obj=obj) for p in perms])
 
     def save(self, *args, **kwargs):
-        # set default values if None provided
-        for field in ('country',):
-            val = getattr(self, field)
-            if val is None:
-                val = self._meta.get_field_by_name(field)[0].default
-                setattr(self, field, val)
+        if isinstance(self.country, str):
+            self.country = Country.from_name(self.country.lower()).id
+        elif self.country is None:
+            self.country = Country.pl.id
         return super().save(*args, **kwargs)
 
     @property

src/ralph/accounts/views.py

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 from datetime import date
 
-import reversion
 from django.conf import settings
 from django.contrib import messages
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseForbidden, HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic import View
+from reversion import revisions as reversion
 
 from ralph.accounts.admin import (
     AssetList,