Add Travis.ci and docker

Author: ericboucher

.DS_Store

@@ -5,6 +5,9 @@ __pycache__/
 *.py[cod]
 *$py.class
 
+# Test files
+.pytest_cache/*
+
 # C extensions
 *.so
 
@@ -115,3 +118,4 @@ cfg/dev-mapswipe_serviceAccountKey.json
 
 
 
+.DS_Store

.gitignore

@@ -0,0 +1,17 @@
+language: python
+sudo: required
+python:
+  - "3.6"
+# command to install dependencies
+before_install:
+  # install gdal
+  - sudo bash install_gdal.sh
+install:
+  - export CPLUS_INCLUDE_PATH=/usr/include/gdal
+  - export C_INCLUDE_PATH=/usr/include/gdal
+  - export PYTHONPATH=$PYTHONPATH:$(pwd)
+  - pip install -r requirements.txt
+  - python setup.py install
+# command to run tests
+script:
+  - pytest

.travis.yml

@@ -0,0 +1,8 @@
+tests:
+	# TODO - Include in install.
+	pip install -r requirements.txt
+	python setup.py install
+	pytest
+
+# [Dummy dependency to force a make command to always run.]
+FORCE:

Makefile

@@ -0,0 +1 @@
+"""Default init.py."""

cfg/__init__.py

@@ -4,7 +4,7 @@
 ############################################
 
 import pyrebase
-import pymysql #handle mysql
+import pymysql  # handle mysql
 import json
 import sys
 
@@ -37,6 +37,7 @@ def firebase_admin_auth():
     firebase = pyrebase.initialize_app(config)
     return firebase
 
+
 def dev_firebase_admin_auth():
     try:
         with open('../cfg/config.cfg') as json_data_file:
@@ -105,7 +106,7 @@ def __init__(self):
                 user = data['mysql']['username']
                 password = data['mysql']['password']
                 host = data['mysql']['host']
-                #print('use configuration for mysql as provided by config.json')
+                # print('use configuration for mysql as provided by config.json')
         except:
             print('we could not load mysql info the config file')
             sys.exit()
@@ -134,7 +135,7 @@ def retr_query(self, query, data):
         return content
 
     def __del__(self):
-        #self._db_cur.close()
+        # self._db_cur.close()
         self._db_connection.close()
 
 
@@ -151,13 +152,12 @@ def __init__(self):
                 user = data['dev_mysql']['username']
                 password = data['dev_mysql']['password']
                 host = data['dev_mysql']['host']
-                #print('use configuration for mysql as provided by config.json')
+                # print('use configuration for mysql as provided by config.json')
         except:
             # Default configuration
             print('we could not load mysql dev info from the config file')
             sys.exit()
 
-
         self._db_connection = pymysql.connect(
             database=dbname,
             user=user,
@@ -182,5 +182,5 @@ def retr_query(self, query, data):
         return content
 
     def __del__(self):
-        #self._db_cur.close()
+        # self._db_cur.close()
         self._db_connection.close()

cfg/auth.py

@@ -0,0 +1,21 @@
+# Simple Python Dockerfile to run tests.
+FROM python:3.6
+
+
+RUN apt-get update
+# Upgrade repo for GDAL
+# RUN apt-get install python-software-properties
+RUN apt-get -y install software-properties-common
+RUN add-apt-repository ppa:ubuntugis/ppa
+
+# Install binary dependencies and GDAL
+COPY ./install_gdal.sh .
+RUN bash install_gdal.sh
+
+
+# Install requirements for the first time
+COPY ./requirements.txt .
+RUN pip install -r requirements.txt
+
+RUN mkdir -p /home/mapswipe-workers
+WORKDIR /home/mapswipe-workers

docker/Dockerfile

@@ -0,0 +1,11 @@
+version: "2"
+services:
+  mapswipe-workers:
+    build:
+        context: ../.
+        dockerfile: ./docker/Dockerfile
+    volumes:
+      # Copy complete folder.
+      - .././:/home/mapswipe-workers/:rw
+    # FIXME - Add working test command.
+    # command: "cd /home/mapswipe-workers/; make tests"

docker/docker-compose.yaml

@@ -0,0 +1 @@
+"""Default init.py."""

export_module/__init__.py

@@ -1,24 +1,17 @@
 #!/bin/python3
 # -*- coding: UTF-8 -*-
 # Author: M. Reinmuth, B. Herfort
-########################################################################################################################
+####################################################################################################
 
 import sys
-# add some files in different folders to sys.
-# these files can than be loaded directly
-sys.path.insert(0, '../cfg/')
-sys.path.insert(0, '../utils/')
 
 import logging
 
-import error_handling
-
-from export_project_results import export_project_results
-from export_projects import export_projects
-from export_users_and_stats import export_users_and_stats
-
-from auth import firebase_admin_auth
-from send_slack_message import send_slack_message
+from export_module.export_project_results import export_project_results
+from export_module.export_projects import export_projects
+from export_module.export_users_and_stats import export_users_and_stats
+from cfg.auth import firebase_admin_auth
+from utils.send_slack_message import send_slack_message
 
 import time
 import argparse
@@ -27,9 +20,10 @@
 # define arguments that can be passed by the user
 parser = argparse.ArgumentParser(description='Process some integers.')
 parser.add_argument('-l', '--loop', dest='loop', action='store_true',
-                    help='if loop is set, the import will be repeated several times. You can specify the behaviour using --sleep_time and/or --max_iterations.')
+                    help='if loop is set, the import will be repeated several times.'
+                         'You can specify the behaviour using --sleep_time / --max_iterations.')
 parser.add_argument('-s', '--sleep_time', required=False, default=None, type=int,
-                    help='the time in seconds for which the script will pause in beetween two imports')
+                    help='time in seconds for which the script will pause in beetween two imports.')
 parser.add_argument('-m', '--max_iterations', required=False, default=None, type=int,
                     help='the maximum number of imports that should be performed')
 
@@ -39,9 +33,10 @@
 parser.add_argument('-p', '--user_project_list', nargs='+', required=None, default=None, type=int,
                     help='project id of the project to process. You can add multiple project ids.')
 parser.add_argument('-o', '--output_path', required=None, default='/var/www/html', type=str,
-                    help='output path. please provide a location where the exported files should be stored.')
+                    help='output path. Provide a location for storing export files.')
+
+####################################################################################################
 
-########################################################################################################################
 
 
 def get_projects():