remove SIX

noxfile.py

@@ -15,7 +15,7 @@
 ALL_INTERPRETERS = (DEFAULT_INTERPRETER,)
 
 
-DEV_INSTALL_REQUIREMENTS = ("six", "django-autoslug")
+DEV_INSTALL_REQUIREMENTS = ("django-autoslug")
 
 
 def get_path(*names):
@@ -43,7 +43,6 @@ def manage(session, *args):
         None
 
     """
-    session.install("six")
     session.install("django-autoslug")
     session.install("Django==3.1")
     session.install('-e', '.')

setup.cfg

@@ -30,7 +30,6 @@ packages = find:
 package_dir=
     =src
 install_requires =
-    six
     Django>=3.2.0
 python_requires = >=3.8
 

src/organizations/abstract.py

@@ -7,8 +7,6 @@
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
-import six
-
 from organizations.base import AbstractBaseInvitation
 from organizations.base import AbstractBaseOrganization
 from organizations.base import AbstractBaseOrganizationOwner
@@ -67,12 +65,11 @@ class Meta:
         abstract = True
 
 
-class AbstractOrganization(
-    six.with_metaclass(OrgMeta, SharedBaseModel, AbstractBaseOrganization)
-):
+class AbstractOrganization(SharedBaseModel, AbstractBaseOrganization):
     """
     Abstract Organization model.
     """
+    __meta__ = OrgMeta
 
     slug = SlugField(
         max_length=200,
@@ -181,12 +178,11 @@ def is_owner(self, user):
         return self.owner.organization_user.user == user
 
 
-class AbstractOrganizationUser(
-    six.with_metaclass(OrgMeta, SharedBaseModel, AbstractBaseOrganizationUser)
-):
+class AbstractOrganizationUser(SharedBaseModel, AbstractBaseOrganizationUser):
     """
     Abstract OrganizationUser model
     """
+    __meta__ = OrgMeta
 
     is_admin = models.BooleanField(default=False)
 
@@ -230,12 +226,11 @@ def get_absolute_url(self):
         )
 
 
-class AbstractOrganizationOwner(
-    six.with_metaclass(OrgMeta, SharedBaseModel, AbstractBaseOrganizationOwner)
-):
+class AbstractOrganizationOwner(SharedBaseModel, AbstractBaseOrganizationOwner):
     """
     Abstract OrganizationOwner model
     """
+    __meta__ = OrgMeta
 
     class Meta:
         abstract = True
@@ -261,12 +256,11 @@ def save(self, *args, **kwargs):
             super().save(*args, **kwargs)
 
 
-class AbstractOrganizationInvitation(
-    six.with_metaclass(OrgMeta, SharedBaseModel, AbstractBaseInvitation)
-):
+class AbstractOrganizationInvitation(SharedBaseModel, AbstractBaseInvitation):
     """
     Abstract OrganizationInvitationBase model
     """
+    __meta__ = OrgMeta
 
     class Meta:
         abstract = True

src/organizations/base.py

@@ -9,8 +9,6 @@
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
-import six
-
 from organizations import signals
 from organizations.managers import ActiveOrgManager
 from organizations.managers import OrgManager
@@ -242,7 +240,9 @@ def is_member(self, user):
         return True if user in self.users.all() else False
 
 
-class OrganizationBase(six.with_metaclass(OrgMeta, AbstractBaseOrganization)):
+class OrganizationBase(AbstractBaseOrganization):
+    __meta__ = OrgMeta
+
     class Meta(AbstractBaseOrganization.Meta):
         abstract = True
 
@@ -293,7 +293,9 @@ def name(self):
             return str(self.user)
 
 
-class OrganizationUserBase(six.with_metaclass(OrgMeta, AbstractBaseOrganizationUser)):
+class OrganizationUserBase(AbstractBaseOrganizationUser):
+    __meta__ = OrgMeta
+
     class Meta(AbstractBaseOrganizationUser.Meta):
         abstract = True
 
@@ -310,7 +312,9 @@ def __str__(self):
         return "{0}: {1}".format(self.organization, self.organization_user)
 
 
-class OrganizationOwnerBase(six.with_metaclass(OrgMeta, AbstractBaseOrganizationOwner)):
+class OrganizationOwnerBase(AbstractBaseOrganizationOwner):
+    __meta__ = OrgMeta
+
     class Meta(AbstractBaseOrganizationOwner.Meta):
         abstract = True
 
@@ -378,6 +382,8 @@ def invitation_token(self):
         raise NotImplementedError
 
 
-class OrganizationInvitationBase(six.with_metaclass(OrgMeta, AbstractBaseInvitation)):
+class OrganizationInvitationBase(AbstractBaseInvitation):
+    __meta__ = OrgMeta
+
     class Meta(AbstractBaseInvitation.Meta):
         abstract = True