Bump postcss, css-loader and postcss-loader in /akvo/rsr/dir

Dockerfile-dev

@@ -28,9 +28,10 @@ RUN set -ex; apt-get update \
 
 RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
     python get-pip.py && \
+    pip install --upgrade pip && \
     rm get-pip.py
 
-ENV NODE_VERSION 10.24.1
+ENV NODE_VERSION 14.21.3
 
 RUN curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
   && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \

Dockerfile-prod-no-code

@@ -9,6 +9,11 @@ RUN set -ex; apt-get update && \
     libxml2-dev libxslt1-dev zlib1g-dev python3-dev && \
     rm -rf /var/lib/apt/lists/*
 
+RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
+    python get-pip.py && \
+    pip install --upgrade pip && \
+    rm get-pip.py
+
 WORKDIR /var/akvo/rsr/code
 
 COPY scripts/deployment/pip/requirements/2_rsr.txt ./

Dockerfile-prod-no-code-with-nodejs

@@ -1,8 +1,8 @@
 FROM akvo/rsr-backend-prod-no-code:local
 
-ENV NODE_VERSION 10.24.1
+ENV NODE_VERSION 14.21.3
 
 RUN curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
   && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
   && rm "node-v$NODE_VERSION-linux-x64.tar.xz" \
-  && ln -s /usr/local/bin/node /usr/local/bin/nodejs
+  && ln -s /usr/local/bin/node /usr/local/bin/nodejs

akvo/cache/memcache.py

@@ -1,91 +1,39 @@
-import operator
-import pickle
-import socket
-from functools import reduce
-from typing import List, Tuple, Dict
+from typing import List
 
-import memcache
-from django.core.cache.backends.memcached import MemcachedCache
+from pymemcache.serde import python_memcache_deserializer
+from pymemcache.serde import python_memcache_serializer
+from django.core.cache.backends.memcached import PyMemcacheCache
 
 
-class AkvoMemcacheClient(memcache.Client):
+class AkvoMemcachedCache(PyMemcacheCache):
 
-    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).
-        """
-        data = []
-        for s in self.servers:
-            if not s.connect():
-                continue
-            if s.family == socket.AF_INET:
-                name = '%s:%s (%s)' % (s.ip, s.port, s.weight)
-            elif s.family == socket.AF_INET6:
-                name = '[%s]:%s (%s)' % (s.ip, s.port, s.weight)
-            else:
-                name = 'unix:%s (%s)' % (s.address, s.weight)
-            serverData = {}
-            data.append((name, serverData))
-            s.send_cmd('stats items')
-            readline = s.readline
-            while 1:
-                line: bytes = readline()
-                if not line or line.strip() == b'END':
-                    break
-                item = line.decode('ascii').strip().split(' ', 2)
-                # 0 = STAT, 1 = ITEM, 2 = Value
-                slab = item[1].split(':', 2)
-                # 0 = items, 1 = Slab #, 2 = Name
-                if slab[1] not in serverData:
-                    serverData[slab[1]] = {}
-                serverData[slab[1]][slab[2]] = item[2]
-        return data
-
-
-class AkvoMemcachedCache(MemcachedCache):
-
-    @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)
-        return self._client
+    def __init__(self, server, params):
+        super().__init__(server, params)
+        self._options = {
+            'serializer': python_memcache_serializer,
+            'deserializer': python_memcache_deserializer,
+            **self._options,
+        }
 
     def list_keys(self) -> List[str]:
         """
         List all keys in memcached
 
         Implementation of https://www.darkcoding.net/software/memcached-list-all-keys/
         """
-        # tuples of (server name, server data)
-        # server data has key: slab_id, value: slab stats
-        data: List[Tuple[str, Dict[str, dict]]] = self._cache.get_slabs()
         keys = []
-        slab_keys = reduce(
-            operator.add,
-            [list(slab_data.keys()) for _, slab_data in data],
-            []
-        )
-        for slab_key in slab_keys:
-            # List max 10,000 keys
-            # tuples of (servername, server data)
-            # server data has key: cache line, value: stats line
-            stat_data: List[Tuple[str, Dict[str, str]]] = self._cache.get_stats(f"cachedump {slab_key} 10000")
-            cache_lines = reduce(
-                operator.add,
-                [list(server_data.keys()) for _, server_data in stat_data],
-                []
-            )
-            # example:
-            # :1:projects_filter__user_45454__418c1b09da887315af25ccde52100faf
-            for cache_line in cache_lines:
-                # 0: ???, 1: id?, 2: key
-                _, _id, key = cache_line.split(":", 2)
-                keys.append(key)
+        for client in self._cache.clients.values():
+            slab_keys = set()
+            items = client.stats('items')
+            for item in items.keys():
+                slab = item.decode('ascii').split(':')
+                slab_keys.add(slab[1])
+            for slab_key in slab_keys:
+                data = client.stats('cachedump', str(slab_key), '10000')
+                for raw_key in data.keys():
+                    # raw_key format "%s:%s:%s" (django.core.cache.backends.base.default_key_func)
+                    key = raw_key.decode('ascii').split(':', 2)
+                    if len(key) < 3:
+                        continue
+                    keys.append(key[2])
         return keys

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