V2 021 21 rebase

.eslintrc.json

@@ -19,6 +19,7 @@
     "arrow-spacing": 1,
     "block-spacing": [1, "never"],
     "brace-style": [1, "1tbs", {"allowSingleLine": true}],
+    "comma-dangle": [1, "always-multiline"],
     "comma-spacing": [1, { "before": false, "after": true }],
     "curly": 1,
     "eol-last": [1, "always"],
@@ -30,6 +31,7 @@
     "no-case-declarations": 1,
     "no-confusing-arrow": 1,
     "no-console": 1,
+    "no-control-regex": 0,
     "no-debugger": 1,
     "no-duplicate-imports": [1, { "includeExports": true }],
     "no-extend-native": 1,
@@ -87,7 +89,9 @@
     "window": false,
     "document": false,
     "Parse": false,
-    "chai": true
+    "chai": true,
+    "t": "readonly",
+    "$": "readonly"
   },
   "plugins": [
     "react"

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,16 +3,16 @@
 1. [ ] If you've added code that should be tested, add tests
 2. [ ] If you've changed APIs, update (or create!) the documentation
 3. [ ] Ensure the tests pass
-4. [ ] Make sure your code lints and you followed [our coding style](https://github.com/kobotoolbox/kpi/blob/master/CONTRIBUTING.md)
-5. [ ] If this is a big feature, make sure to prefix the title with `Feature:` and add a thorough description for non-dev folk
+4. [ ] Make sure that your code lints and that you've followed [our coding style](https://github.com/kobotoolbox/kpi/blob/master/CONTRIBUTING.md)
+5. [ ] Write a description of your work suitable for publishing on [our forum](https://community.kobotoolbox.org/tag/release-notes)
+6. [ ] Mention any related issues in this repository (as #ISSUE) and in other repositories (as kobotoolbox/other#ISSUE)
 
 ## Description
 
-<!-- Description of the changes -->
+<!-- Describe your work here. If users will notice your changes, be sure to write in user-friendly language. -->
 
 ## Related issues
 
 <!-- Fixes #ISSUE -->
 <!-- Blocked by #ISSUE -->
 <!-- Part of #ISSUE -->
-

.travis.yml

@@ -45,6 +45,7 @@ env:
        DJANGO_SETTINGS_MODULE=kobo.settings.testing
        DJANGO_LANGUAGE_CODES="en ar es fr hi ku pl pt zh-hans"
        DATABASE_URL="postgres://postgres@localhost:5432/travis_ci_test"
+
        REDIS_SESSION_URL="redis://localhost:6379"
        TRAVIS_NODE_VERSION="8"
        PATH=$PATH:$HOME/build/kobotoolbox/kpi/node_modules/.bin/

CHANGELOG.md

@@ -0,0 +1,7 @@
+## [Unreleased]
+
+##### Fixed
+
+##### Changed
+* TODO: Describe all public-collection backend changes
+* A new management command has been created to update collection languages. It should be run against existing databases: `./manage.py update_collection_languages`

Dockerfile

@@ -40,6 +40,8 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+
 RUN apt -qq update && \
     apt -qq -y install \
         gdal-bin \
@@ -84,6 +86,7 @@ RUN pip-sync /srv/tmp/pip_dependencies.txt 1>/dev/null && \
 
 WORKDIR ${KPI_SRC_DIR}/
 RUN rm -rf ${KPI_NODE_PATH} && \
+    npm install -g check-dependencies && \
     npm install --quiet && \
     npm install -g check-dependencies && \
     npm cache clean --force

LICENSE

@@ -1,7 +1,7 @@
 GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

dependencies/pip/dev_requirements.txt

@@ -65,7 +65,7 @@ formencode==1.3.1         # via pyxform
 future==0.18.2            # via -r dependencies/pip/requirements.in
 geojson-rewind==0.2.0     # via -r dependencies/pip/requirements.in, formpack
 idna==2.8                 # via requests
-importlib-metadata==0.23  # via jsonschema, kombu, path.py
+importlib-metadata==1.7.0  # via -r dependencies/pip/requirements.in, jsonschema, kombu, path.py
 invoke==1.3.0             # via fabric
 ipython-genutils==0.2.0   # via traitlets
 ipython==7.9.0            # via -r dependencies/pip/dev_requirements.in

dependencies/pip/external_services.txt

@@ -59,7 +59,7 @@ formencode==1.3.1         # via pyxform
 future==0.18.2            # via -r dependencies/pip/requirements.in
 geojson-rewind==0.2.0     # via -r dependencies/pip/requirements.in, formpack
 idna==2.8                 # via requests
-importlib-metadata==0.23  # via jsonschema, kombu, path.py
+importlib-metadata==1.7.0  # via -r dependencies/pip/requirements.in, jsonschema, kombu, path.py
 jmespath==0.9.4           # via boto3, botocore
 jsonfield==2.0.2          # via -r dependencies/pip/requirements.in
 jsonschema==3.1.1         # via formpack

dependencies/pip/requirements.in

@@ -27,8 +27,8 @@ dj-static
 dj-database-url
 django-braces
 django-constance[database]
-django-cors-headers
-django-debug-toolbar
+django-cors-headers<3 # 3.0.0 dropped support for Python2 support
+django-debug-toolbar<2 # Last Python2 support: 1.11
 django-extensions
 django-oauth-toolkit
 django-registration-redux