[Python3 and Django2.2 upgrade] part 4 - Use Python3 & Django 1.11

.travis.yml

@@ -2,23 +2,60 @@
 branches:
   only: 
     - master
-
-sudo: false
+dist: xenial
+sudo: required
 language: python
 python:
-- '2.7'
+  - "2.7"
+services:
+  - postgresql
+  - redis-server
+addons:
+  postgresql: "9.5"
+  chrome: stable
+  apt:
+    packages:
+      - build-essential
+      - fontforge
+      - gettext
+      - git-core
+      - libpcre3
+      - libpcre3-dev
+      - libpq-dev
+      - libgnutls28-dev
+      - binutils
+      - default-jre-headless
+      - gdal-bin
+      - libpcre3-dev
+      - libpq-dev
+      - libproj-dev
+      - libxml2
+      - libxml2-dev
+      - libxslt1-dev
+      - libjpeg-dev
+      - libffi-dev
+      - postgresql-client
+      - postgresql-9.5-postgis-2.5
+      - libsqlite3-mod-spatialite
+cache:
+  directories:
+    - $HOME/.pip-download-cache
+before_script:
+  - psql -c 'create database travis_ci_test;' -U postgres
+  - psql -U postgres -c "create extension postgis"
 script:
-- 
-after_success:
-- test "$TRAVIS_PULL_REQUEST" == 'false' || exit 0
-- test "$TRAVIS_BRANCH" == 'master' || exit 0
-- echo '*** Deploying to staging server'
-- openssl aes-256-cbc -K $encrypted_cddd71e0ad67_key -iv $encrypted_cddd71e0ad67_iv
-  -in .travis/staging_deploy_key.pem.enc -out .travis/staging_deploy_key.pem -d
-- chmod 600 .travis/staging_deploy_key.pem
-- eval "$(ssh-agent)"
-- ssh-add .travis/staging_deploy_key.pem
-- ssh -o UserKnownHostsFile=.travis/staging_known_host [email protected] /home/ubuntu/scripts/deploy.sh kobocat "$TRAVIS_COMMIT"
-notifications:
-  irc: irc.freenode.org#kobotest
-  flowdock: ad631fc562736cf87e0c4439f9518f9d
+  - pytest -vv
+env:
+  # All about YAML line breaks: https://stackoverflow.com/a/21699210
+  - >-
+       PIP_DOWNLOAD_CACHE=$HOME/.pip-download-cache
+       DJANGO_DEBUG=False
+       DJANGO_SECRET_KEY=o4xbmwsyTJicFmjhQc4Xm
+       DJANGO_SETTINGS_MODULE=onadata.settings.test_environ
+       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"
+install:
+  - pip install --upgrade 'pip>=10,<11'
+  - pip install -r requirements/travis.pip

conftest.py

@@ -20,16 +20,10 @@
     'peter',
 ]
 
-try:
-    INTERRUPTED = pytest.ExitCode.INTERRUPTED  # pytest 5
-except AttributeError:
-    INTERRUPTED = 2
-
 
 def stderr_prompt(message):
     sys.stderr.write(message)
-    # FIXME: Python 3 compatibility
-    return raw_input().strip()
+    return input().strip()
 
 
 def toggle_capturing(capture_manager, stop):
@@ -63,7 +57,7 @@ def setup(request):
             if response.lower() != 'yes':
                 if is_global_capturing:
                     toggle_capturing(capture_manager, stop=False)
-                pytest.exit('User interrupted tests', INTERRUPTED)
+                pytest.exit('User interrupted tests', pytest.ExitCode.INTERRUPTED)
 
     if 'instances' in settings.MONGO_DB.collection_names():
         response = stderr_prompt(
@@ -77,7 +71,7 @@ def setup(request):
         else:
             if is_global_capturing:
                 toggle_capturing(capture_manager, stop=False)
-            pytest.exit('User interrupted tests', INTERRUPTED)
+            pytest.exit('User interrupted tests', pytest.ExitCode.INTERRUPTED)
 
     if is_global_capturing:
         toggle_capturing(capture_manager, stop=False)

docker/dev_wrong_port_warning.py

@@ -5,20 +5,22 @@
 provides a helpful message to anyone still trying to use port 8000
 """
 
-import BaseHTTPServer
 import sys
+from http.server import BaseHTTPRequestHandler, HTTPServer
 
-class Handler(BaseHTTPServer.BaseHTTPRequestHandler):
+
+class Handler(BaseHTTPRequestHandler):
     def do_GET(self):
         self.send_response(503)
         self.end_headers()
         self.wfile.write(
-            'Your development environment is trying to connect to the KoBoCAT '
-            'container on port 8000 instead of 8001. Please change this. See '
-            'https://github.com/kobotoolbox/kobo-docker/issues/301 '
-            'for more details.'
+            b'Your development environment is trying to connect to the KoBoCAT '
+            b'container on port 8000 instead of 8001. Please change this. See '
+            b'https://github.com/kobotoolbox/kobo-docker/issues/301 '
+            b'for more details.'
         )
 
+
 server_address = ('', int(sys.argv[1]))
-httpd = BaseHTTPServer.HTTPServer(server_address, Handler)
+httpd = HTTPServer(server_address, Handler)
 httpd.serve_forever()

kobocat-template/static/css/kobo-branding.css

@@ -330,7 +330,7 @@ section {
 .single-project__header .container,
 .projects-list__header .container,
 .data-page__header .container {
-  max-width: 984px;
+  max-width: 960px;
 }
 
 .single-project__header .fa-caret-right,
@@ -681,4 +681,4 @@ i.fa-trash-o {
   td.footable-first-column {
     padding-right: 0px !important;
   }
-}
+}

kobocat-template/static/css/kobo-single-project.css

@@ -189,14 +189,15 @@ button.single-project__button-delete {
 }
 
 .dashboard__left {
-  width: 72%;
+  width: 60%;
   float: left;
   margin-left: 1%;
 }
 
 .dashboard__right {
   width: 25%;
   float: left;
+  margin-left: -13%;
 }
 
 h2.dashboard__group-label {
@@ -205,9 +206,8 @@ h2.dashboard__group-label {
 }
 
 .dashboard__submissions {
-  width: 55%;
+  width: 33%;
   float: left;
-  margin-right: 5%;
   position: relative;
 }
 
@@ -268,7 +268,7 @@ a.dashboard__button-download-data:hover span {
 }
 
 .dashboard__submissions a.dashboard__button {
-  width: 30%;
+  width: 60%;
 }
 
 a.dashboard__button-twoline span {
@@ -351,8 +351,8 @@ a.dashboard__formbutton-refresh {
 
 .dashboard__download__drop {
   position: absolute;
-  right: 22px;
-  bottom: -150px;
+  left: 0;
+  bottom: -128px;
   width: 124px;
   border: 1px solid #E7E8E9;
   background: white;
@@ -629,4 +629,4 @@ span.poshytip {
   .dashboard__download__drop {
     bottom: -190px;
   }
-}
+}