Merge remote-tracking branch 'origin/feature/add_configmap_to_minikube'

Author: albertovara

.travis.yml

@@ -3,7 +3,13 @@ sudo: false
 cache: false
 python:
     - '3.6'
-
+addons:
+  apt:
+    sources:
+      - deadsnakes
+    packages:
+    - python3.5
+    - python3.5-dev
 install:
   - pip install -rrequirements-tests.txt
 

config.yml

@@ -4,4 +4,6 @@ ms:
   APP_NAME: Template
   APPLICATION_ROOT : /template
   SQLALCHEMY_TRACK_MODIFICATIONS: true
-  SECRET_KEY: "gjr39dkjn344_!67#"
+  SECRET_KEY: "gjr39dkjn344_!67#"
+  DATABASE: db.sqlite3
+  SQLALCHEMY_DATABASE_URI: sqlite:///db.sqlite3

service.yaml

@@ -1,4 +1,3 @@
-# interno
 kind: Service
 apiVersion: v1
 kind: Service
@@ -31,6 +30,33 @@ spec:
           ports:
             - name: http
               containerPort: 5000
+          env:
+            - name: CONFIGMAP_FILE
+              value: "/usr/share/microservice/config.yaml"
+          volumeMounts:
+            - mountPath: /usr/share/microservice
+              name: ms-config-volume
+      volumes:
+        - name: ms-config-volume
+          configMap:
+            name: template-configmap
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: template-configmap
+data:
+  # When the config map is mounted as a volume, these will be created as files.
+  config.yaml: |-
+    ms:
+      DEBUG: false
+      TESTING: false
+      APP_NAME: Template
+      APPLICATION_ROOT : /template
+      SQLALCHEMY_TRACK_MODIFICATIONS: true
+      SECRET_KEY: "gjr39dkjn344_!67#"
+      DATABASE: db.sqlite3
+      SQLALCHEMY_DATABASE_URI: sqlite:///db.sqlite3
 ---
 apiVersion: extensions/v1beta1
 kind: Ingress

setup.py

@@ -30,9 +30,11 @@
         "License :: OSI Approved :: GPL License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
+        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6"
     ],
-    license="GPL",
+    python_requires='>=3.5',
+    license="GPLv3",
     platforms=["any"],
     keywords="python, microservices",
     url='https://github.com/python-microservices/microservices-scaffold',

tests/test_views.py

@@ -8,6 +8,9 @@
 
 
 def _format_response(response: Text = "") -> Union[List, Dict]:
+    # python3.5 compatibility
+    if isinstance(response, bytes):
+        response = str(response, encoding="utf-8")
     return json.loads(response)
 
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py36
+envlist = py36,py35
 
 [testenv]
 deps =