Merge pull request #1 from akvo/django4-lts-upgrade

Upgrade to postgres 14.11 for dev env

akvo/cache/memcache.py

@@ -4,18 +4,20 @@
 from functools import reduce
 from typing import List, Tuple, Dict
 
-import memcache
-from django.core.cache.backends.memcached import MemcachedCache
+import pymemcache
+from django.core.cache.backends.memcached import PyMemcacheCache
 
 
-class AkvoMemcacheClient(memcache.Client):
+class AkvoMemcacheClient(pymemcache.HashClient):
 
     def get_slabs(self) -> List[Tuple[str, Dict[str, dict]]]:  # pragma: no cover
         """
         Override to fix decoding error in super().get_slabs
 
         Slabs are memory regions in memcache where data is stored.
         They have a unique ID (number).
+
+        FIXME: Needs to be rewritten because the dependency is changed to pymemcache
         """
         data = []
         for s in self.servers:
@@ -45,16 +47,14 @@ def get_slabs(self) -> List[Tuple[str, Dict[str, dict]]]:  # pragma: no cover
         return data
 
 
-class AkvoMemcachedCache(MemcachedCache):
+class AkvoMemcachedCache(PyMemcacheCache):
 
     @property
     def _cache(self):
         """Provide our AkvoMemcacheClient for cache access"""
 
         if getattr(self, '_client', None) is None:
-            client_kwargs = dict(pickleProtocol=pickle.HIGHEST_PROTOCOL)
-            client_kwargs.update(self._options)
-            self._client = AkvoMemcacheClient(self._servers, **client_kwargs)
+            self._client = AkvoMemcacheClient(self._servers, **self._options)
         return self._client
 
     def list_keys(self) -> List[str]:

akvo/codelists/models/activity_date_type.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/activity_scope.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/activity_status.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/aid_type.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/aid_type_category.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/aid_type_flag.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/aid_type_vocabulary.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/base_codelist.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class BaseCodelist(models.Model):

akvo/codelists/models/budget_identifier.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/budget_identifier_sector.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/budget_identifier_sector_category.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/budget_identifier_vocabulary.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/budget_not_provided.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/budget_status.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/budget_type.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/cashand_voucher_modalities.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/collaboration_type.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/condition_type.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/contact_type.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/country.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/crs_add_other_flags.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/crs_channel_code.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/currency.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/description_type.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/disbursement_channel.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/document_category.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/document_category_category.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/earmarking_category.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/file_format.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/finance_type.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/finance_type_category.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/flow_type.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/gazetteer_agency.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/geographic_exactness.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/geographic_location_class.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/geographic_location_reach.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/geographic_vocabulary.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/geographical_precision.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist
 

akvo/codelists/models/humanitarian_scope_type.py

@@ -6,7 +6,7 @@
 
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .base_codelist import BaseCodelist