Upgrade dependencies for Django 3.x upgrade

.flake8

@@ -3,3 +3,4 @@ max-line-length = 88
 ...
 select = C,E,F,W,B,B950
 extend-ignore = E203, E501
+per-file-ignores = __init__.py:F401

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,9 +4,10 @@
 
 ### Side effects of implementing this change
 
-### Before submitting this PR for review, please make sure you have:
 
-- [ ] Included tests 
-- [ ] Updated documentation
+**Before submitting this PR for review, please make sure you have:**
+
+  - [ ] Included tests
+  - [ ] Updated documentation
 
 Closes #

.github/workflows/ci.yml

@@ -37,14 +37,14 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
-          java-version: '8'
+          distribution: "adopt"
+          java-version: "8"
 
       - name: Setup python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
-          python-version: 3.8
-          architecture: 'x64'
+          python-version: 3.9
+          architecture: "x64"
 
       - name: Get pip cache dir
         id: pip-cache
@@ -61,14 +61,15 @@ jobs:
       - name: Install APT requirements
         run: |
           sudo apt-get update
-          sudo apt-get install -y --no-install-recommends libjpeg-dev zlib1g-dev software-properties-common ghostscript libxslt1-dev binutils libproj-dev gdal-bin memcached libmemcached-dev
+          sudo apt-get install -y --no-install-recommends libjpeg-dev zlib1g-dev software-properties-common ghostscript libxslt1-dev binutils libproj-dev gdal-bin memcached libmemcached-dev libxml2-dev libxslt-dev
           sudo rm -rf /var/lib/apt/lists/*
 
       - name: Install Pip requirements
         run: |
           pip install -U pip
           pip install -r requirements/base.pip
           pip install flake8
+          pip install tblib
 
       - name: Run tests
         run: |

.gitignore

@@ -82,3 +82,7 @@ tags
 
 .bash_history
 .inputrc
+
+.eggs
+sonar-project.properties
+.scannerwork

.prospector.yaml

@@ -0,0 +1,6 @@
+strictness: medium
+doc-warnings: false
+test-warnings: false
+autodetect: true
+member-warnings: false
+max-line-length: 88

.pylintrc

@@ -50,7 +50,7 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call
+disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call,too-few-public-methods
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option

CONTRIBUTING.MD

@@ -10,37 +10,37 @@ The following is a set of guidelines for contributing to Ona Data. Following the
 
 In case you have encountered any issue within the project, please make sure:
 
-- You are using the [latest release](http://github.com/onaio/onadata/releases).
-- You have setup the project according to the [Installation Documentation](https://api.ona.io/static/docs/install.html).
+  - You are using the [latest release](http://github.com/onaio/onadata/releases).
+  - You have setup the project according to the [Installation Documentation](https://api.ona.io/static/docs/install.html).
 
 After confirming the above, make sure the issue has not been reported on our [issues page](https://github.com/onaio/onadata/issues). If it hasn't been reported, [open a ticket](https://github.com/onaio/onadata/issues/new) containing:
 
-- Information about your system environment (Operating System, local settings, etc.).
-- What you expected to happen, and what actually happened.
-- Out of place / weird logs and any other interesting information
-- All steps to reproduce the issue.
+  - Information about your system environment (Operating System, local settings, etc.).
+  - What you expected to happen, and what actually happened.
+  - Out of place / weird logs and any other interesting information
+  - All steps to reproduce the issue.
 
 ### 2. Suggest Enhancements or New Features ⚡
 
 Feature and enhancement requests are always welcome! We ask you ensure the following details are provided while [opening a ticket](https://github.com/onaio/onadata/issues/new), in order to start a constructive discussion:
 
-- Describe the feature/enhancement in detail.
-- Explain why the feature/enhancement is needed.
-- Describe how the feature/enhancement should work
-- List any advantages & disadvantages of implementing the feature/enhancement
+  - Describe the feature/enhancement in detail.
+  - Explain why the feature/enhancement is needed.
+  - Describe how the feature/enhancement should work
+  - List any advantages & disadvantages of implementing the feature/enhancement
 
 ### 3. Code contributions / Pull requests 💻
 
 Pull requests are wholeheartedly welcome!❤️ If you are unsure about how to make your first pull request, here are some helpful resources:
 
-- [Creating a pull request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request)
-- [How to create effective pull requests](https://dev.to/mpermar/how-to-create-effective-pull-requests-2m8e)
+  - [Creating a pull request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request)
+  - [How to create effective pull requests](https://dev.to/mpermar/how-to-create-effective-pull-requests-2m8e)
 
 In order to make it easier for us to facilitate the smooth merging of your pull request, please make sure the following standards are met within your pull request.
 
-- Ensure your git commits are signed. _Read about signing commits [here](https://help.github.com/en/github/authenticating-to-github/signing-commits)_
-- Code & commits follow our [styleguides](#Styleguides).
-- Implement / Update tests that need to be updated and ensure that they pass. _Running all the tests within this project may be tough and time consuming. But not to worry! On submission of the pull request, [Travis CI](https://travis-ci.org/) will run all the tests across our modules_.
+  - Ensure your git commits are signed. _Read about signing commits [here](https://help.github.com/en/github/authenticating-to-github/signing-commits)_
+  - Code & commits follow our [styleguides](#Styleguides).
+  - Implement / Update tests that need to be updated and ensure that they pass. _Running all the tests within this project may be tough and time consuming. But not to worry! On submission of the pull request, [Travis CI](https://travis-ci.org/) will run all the tests across our modules_.
 
 With the above points in mind feel free to comment on one of our [beginner-friendly issues](https://github.com/onaio/onadata/issues?q=is%3Aissue+is%3Aopen+label%3A%22Good+First+Issue%22) expressing your intent to work on it.
 

docker-compose.yml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   db:
-    image: postgis/postgis:9.6-3.0
+    image: postgis/postgis:13-3.0
     environment:
       - POSTGRES_PASSWORD=onadata
       - POSTGRES_USER=onadata
@@ -29,7 +29,7 @@ services:
       - db
       - queue
     environment:
-      - SELECTED_PYTHON=python3.6
+      - SELECTED_PYTHON=python3.9
       - INITDB=false
   notifications:
     image: emqx/emqx:4.3.2

docker/docker-entrypoint.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ ${INITDB} ]; then
+if [ "${INITDB}" ]; then
     RUN_DB_INIT_SCRIPT=$INITDB
 else
     RUN_DB_INIT_SCRIPT=true
@@ -13,8 +13,8 @@ if $RUN_DB_INIT_SCRIPT; then
     psql -h db -U postgres onadata -c "CREATE EXTENSION postgis; CREATE EXTENSION postgis_topology;"
 fi
 
-virtualenv -p `which $SELECTED_PYTHON` /srv/onadata/.virtualenv/${SELECTED_PYTHON}
-. /srv/onadata/.virtualenv/${SELECTED_PYTHON}/bin/activate
+virtualenv -p "$(which "${SELECTED_PYTHON}")" "/srv/onadata/.virtualenv/${SELECTED_PYTHON}"
+. /srv/onadata/.virtualenv/"${SELECTED_PYTHON}"/bin/activate
 
 cd /srv/onadata
 pip install --upgrade pip

docker/onadata-uwsgi/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8 as intermediate
+FROM python:3.9 as intermediate
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV PYTHONUNBUFFERED 1
@@ -14,7 +14,7 @@ RUN mkdir -m 0600 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
 RUN --mount=type=ssh if [ -n "$optional_packages" ]; then pip install ${optional_packages} ; fi
 
 FROM ubuntu:20.04
-COPY --from=intermediate /usr/local/lib/python3.8/site-packages/ /usr/local/lib/python3.8/dist-packages/
+COPY --from=intermediate /usr/local/lib/python3.9/site-packages/ /usr/local/lib/python3.9/dist-packages/
 
 ARG release_version=v2.4.1
 
@@ -35,8 +35,8 @@ RUN apt-get update -q &&\
         libmemcached-dev \
         build-essential \
         supervisor \
-        python3.8 \
-        python3.8-dev \
+        python3.9 \
+        python3-dev \
         python3-pip \
         python3-setuptools \
         git \
@@ -47,6 +47,7 @@ RUN apt-get update -q &&\
         libjpeg-dev \
         libxml2-dev \
         libxslt1-dev \
+        libpython3.9-dev \
         zlib1g-dev \
         ghostscript \
         python3-celery \
@@ -79,11 +80,11 @@ COPY uwsgi.ini /uwsgi.ini
 # Install service requirements
 WORKDIR /srv/onadata
 # hadolint ignore=DL3013
-RUN python3 -m pip install --no-cache-dir -U pip && \
-    python3 -m pip install --no-cache-dir -r requirements/base.pip && \
-    python3 -m pip install --no-cache-dir -r requirements/s3.pip && \
-    python3 -m pip install --no-cache-dir -r requirements/ses.pip && \
-    python3 -m pip install --no-cache-dir uwsgitop django-prometheus==v2.2.0
+RUN python3.9 -m pip install --no-cache-dir -U pip && \
+    python3.9 -m pip install --no-cache-dir -r requirements/base.pip && \
+    python3.9 -m pip install --no-cache-dir -r requirements/s3.pip && \
+    python3.9 -m pip install --no-cache-dir -r requirements/ses.pip && \
+    python3.9 -m pip install --no-cache-dir pyyaml uwsgitop django-prometheus==v2.2.0
 
 # Compile API Docs
 RUN make -C docs html

docker/onadata-uwsgi/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   db:
-    image: postgis/postgis:9.6-3.0
+    image: postgis/postgis:13-3.0
     environment:
       - POSTGRES_PASSWORD=onadata
       - POSTGRES_USER=onadata

docker/postgis/Dockerfile

@@ -1,12 +1,11 @@
 FROM postgres:9.6
 
-MAINTAINER Ukang'a Dickson <[email protected]>
-
-
 RUN apt-get update \
   &&  DEBIAN_FRONTEND=noninteractive \
-    apt-get install -y postgresql-9.6-postgis-2.3 \
-    postgresql-9.6-postgis-script postgis \
+    apt-get install --no-install-recommends -y \
+      postgresql-9.6-postgis-2.3=2.3.1+dfsg-2+deb9u2 \
+      postgresql-9.6-postgis-2.3-scripts=2.3.1+dfsg-2+deb9u2 \
+      postgis=2.3.1+dfsg-2+deb9u2 \
   && rm -rf /var/lib/apt/lists/*
 
 ENTRYPOINT ["docker-entrypoint.sh"]

onadata/__init__.py

@@ -6,7 +6,7 @@
 """
 from __future__ import absolute_import, unicode_literals
 
-__version__ = "2.5.20"
+__version__ = "3.0.0"
 
 
 # This will make sure the app is always imported when

onadata/apps/api/admin.py

@@ -1,39 +1,38 @@
+# -*- coding: utf-8 -*-
+"""API Django admin amendments."""
 from django.contrib import admin
 
 from onadata.apps.api.models import Team, OrganizationProfile, TempToken
 
 
-class TeamAdmin(admin.ModelAdmin):
+# pylint: disable=too-few-public-methods
+class FilterSuperuserMixin:
+    """Filter by request user and give full access to superuser."""
 
     def get_queryset(self, request):
-        qs = super(TeamAdmin, self).get_queryset(request)
+        """Filter by request.user unless is_superuser."""
+        queryset = super().get_queryset(request)
         if request.user.is_superuser:
-            return qs
-        return qs.filter(user=request.user)
+            return queryset
+        return queryset.filter(user=request.user)
 
 
-admin.site.register(Team, TeamAdmin)
+class TeamAdmin(FilterSuperuserMixin, admin.ModelAdmin):
+    """Filter by request.user unless is_superuser."""
 
 
-class OrganizationProfileAdmin(admin.ModelAdmin):
+admin.site.register(Team, TeamAdmin)
 
-    def get_queryset(self, request):
-        qs = super(OrganizationProfileAdmin, self).get_queryset(request)
-        if request.user.is_superuser:
-            return qs
-        return qs.filter(user=request.user)
 
+class OrganizationProfileAdmin(FilterSuperuserMixin, admin.ModelAdmin):
+    """Filter by request.user unless is_superuser."""
 
-admin.site.register(OrganizationProfile, OrganizationProfileAdmin)
 
+admin.site.register(OrganizationProfile, OrganizationProfileAdmin)
 
-class TempTokenProfileAdmin(admin.ModelAdmin):
 
-    def get_queryset(self, request):
-        qs = super(TempTokenProfileAdmin, self).get_queryset(request)
-        if request.user.is_superuser:
-            return qs
-        return qs.filter(user=request.user)
+class TempTokenProfileAdmin(FilterSuperuserMixin, admin.ModelAdmin):
+    """Filter by request.user unless is_superuser."""
 
 
 admin.site.register(TempToken, TempTokenProfileAdmin)