Develop (#106)

* Update coverage from 4.5.4 to 5.0

* Update sqlalchemy from 1.3.11 to 1.3.12

* Updated PyMS to 2.0.0rc1

* Update sqlalchemy from 1.3.11 to 1.3.12

* Updated tests and docker config

* Update tox from 3.14.2 to 3.14.3

* Update coveralls from 1.9.2 to 1.10.0

* Update coverage from 4.5.4 to 5.0.2

* Increment pyms version

Co-authored-by: pyup.io bot <[email protected]>

Author: avara1986

config-docker.yml

@@ -1,19 +1,20 @@
 pyms:
-  requests:
-    data: ""
-  swagger:
-    path: "swagger"
-    file: "swagger.yaml"
-  tracer:
-    client: "jaeger"
-    host: "localhost"
-    component_name: "Python Microservice"
-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:////microservice/database/db.sqlite3
+  services:
+    requests:
+      data: ""
+    swagger:
+      path: "swagger"
+      file: "swagger.yaml"
+    tracer:
+      client: "jaeger"
+      host: "localhost"
+      component_name: "Python Microservice"
+  config:
+    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:////microservice/database/db.sqlite3

config.yml

@@ -1,20 +1,21 @@
 pyms:
-  requests:
-    data: ""
-  swagger:
-    path: "swagger"
-    file: "swagger.yaml"
-    url: "/ui/"
-  tracer:
-    client: "jaeger"
-    host: "localhost"
-    component_name: "Python Microservice"
-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:////tmp/db.sqlite3
+  services:
+    requests:
+      data: ""
+    swagger:
+      path: "swagger"
+      file: "swagger.yaml"
+      url: "/ui/"
+    tracer:
+      client: "jaeger"
+      host: "localhost"
+      component_name: "Python Microservice"
+  config:
+    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:////tmp/db.sqlite3

requirements-tests.txt

@@ -1,6 +1,6 @@
 -r requirements.txt
-coveralls==1.9.2
-coverage==4.5.4
+coveralls==1.10.0
+coverage==5.0.2
 nose==1.3.7
 pylint==2.4.4
-tox==3.14.2
+tox==3.14.3

requirements.txt

@@ -1,4 +1,4 @@
 Flask-SQLAlchemy==2.4.1
-SQLAlchemy==1.3.11
+SQLAlchemy==1.3.12
 Flask-Script==2.0.6
-py-ms==1.5.0
+py-ms==2.0.0

tests/config-tests.yml

@@ -1,19 +1,20 @@
 pyms:
-  requests:
-    data: ""
-  swagger:
-    path: "swagger"
-    file: "swagger.yaml"
-  tracer:
-    client: "jaeger"
-    host: "localhost"
-    component_name: "Python Microservice"
-ms:
-  DEBUG: false
-  TESTING: true
-  APP_NAME: Template
-  APPLICATION_ROOT : /template
-  SQLALCHEMY_TRACK_MODIFICATIONS: true
-  SECRET_KEY: "gjr39dkjn344_!67#"
-  DATABASE: db_test.sqlite3
-  SQLALCHEMY_DATABASE_URI: sqlite:///db_test.sqlite3
+  services:
+    requests:
+      data: ""
+    swagger:
+      path: "swagger"
+      file: "swagger.yaml"
+    tracer:
+      client: "jaeger"
+      host: "localhost"
+      component_name: "Python Microservice"
+  config:
+    DEBUG: false
+    TESTING: true
+    APP_NAME: Template
+    APPLICATION_ROOT : /template
+    SQLALCHEMY_TRACK_MODIFICATIONS: true
+    SECRET_KEY: "gjr39dkjn344_!67#"
+    DATABASE: db_test.sqlite3
+    SQLALCHEMY_DATABASE_URI: sqlite:///db_test.sqlite3