Fixed Docker issue python-microservices#181 (python-microservices#188)

* Updated requirements

* Fix docker configuration

* Fix swagger yaml

* Fix tests

Author: avara1986

Dockerfile

@@ -4,7 +4,7 @@ RUN apk add --update curl gcc g++ git libffi-dev openssl-dev python3-dev build-b
     && rm -rf /var/cache/apk/*
 RUN ln -s /usr/include/locale.h /usr/include/xlocale.h
 
-ENV PYTHONUNBUFFERED=1 ENVIRONMENT=pre APP_HOME=/microservice/
+ENV PYTHONUNBUFFERED=1 APP_HOME=/microservice/
 ENV DATABASE_DIR=database
 ENV CONFIGMAP_FILE="$APP_HOME"config-docker.yml
 RUN mkdir $APP_HOME && adduser -S -D -H python

Pipfile

@@ -4,18 +4,18 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-Flask-SQLAlchemy = "==2.4.1"
-SQLAlchemy = "==1.3.16"
+Flask-SQLAlchemy = "==2.4.4"
+SQLAlchemy = "==1.3.19"
 Flask-Script = "==2.0.6"
-py-ms = {extras = ["all"],version = "==2.4.0"}
-marshmallow = "==3.5.1"
-marshmallow-sqlalchemy = "==0.22.3"
+py-ms = {extras = ["all"],version = "==2.6.1"}
+marshmallow = "==3.8.0"
+marshmallow-sqlalchemy = "==0.23.1"
 
 [dev-packages]
 requests-mock = "*"
 coverage = "==4.5.4"
-pytest = "*"
-pytest-cov = "*"
+pytest = ">=5.4.3"
+pytest-cov = ">=2.9.0"
 pylint = "*"
 flake8 = "*"
 tox = "*"

Pipfile.lock

@@ -5,15 +5,17 @@ pyms:
     swagger:
       path: "swagger"
       file: "swagger.yaml"
+      url: "/ui/"
+      project_dir: "project.views"
     tracer:
       client: "jaeger"
       host: "localhost"
       component_name: "Python Microservice"
   config:
     DEBUG: false
     TESTING: false
-    APP_NAME: Template
-    APPLICATION_ROOT : /template
+    APP_NAME: Films&Actors
+    APPLICATION_ROOT : ""
     SQLALCHEMY_TRACK_MODIFICATIONS: true
     SECRET_KEY: "gjr39dkjn344_!67#"
     DATABASE: db.sqlite3

config-docker.yml

@@ -26,7 +26,7 @@ Or innstall with pipenv
 Advantages over plain pip and requirements.txt
 ----------------------------------------------
 
-Pipenv generates two files: a `Pipfile`and a `Pipfile.lock`.
+Pipenv generates two files: a `Pipfile` and a `Pipfile.lock`.
 
 * `Pipfile`: Is a high level declaration of the dependencies of your project. It can contain "dev" dependencies
 (usually test related stuff) and "standard" dependencies which are the ones you'll need for your project to function

docs/installation.rst

@@ -42,11 +42,11 @@ paths:
         schema:
           $ref: "#/definitions/Actor"
       responses:
-        200:
+        "200":
           description: "The actor created"
           schema:
             $ref: '#/definitions/Actor'
-        405:
+        "405":
           description: "Invalid input"
     get:
       tags:
@@ -58,15 +58,15 @@ paths:
       produces:
       - "application/json"
       responses:
-        200:
+        "200":
           description: "A list of actors"
           schema:
             $ref: '#/definitions/Actors'
-        400:
+        "400":
           description: "Invalid ID supplied"
-        404:
+        "404":
           description: "Actor not found"
-        405:
+        "405":
           description: "Validation exception"
   /films:
     post:
@@ -86,11 +86,11 @@ paths:
         schema:
           $ref: "#/definitions/Film"
       responses:
-        200:
+        "200":
           description: "The film created"
           schema:
             $ref: '#/definitions/Film'
-        405:
+        "405":
           description: "Invalid input"
     get:
       tags:
@@ -102,15 +102,15 @@ paths:
       produces:
       - "application/json"
       responses:
-        200:
+        "200":
           description: "A list of actors"
           schema:
             $ref: '#/definitions/Films'
-        400:
+        "400":
           description: "Invalid ID supplied"
-        404:
+        "404":
           description: "Actor not found"
-        405:
+        "405":
           description: "Validation exception"
   /films/{id}:
     put:
@@ -135,11 +135,11 @@ paths:
         schema:
           $ref: "#/definitions/Film"
       responses:
-        200:
+        "200":
           description: "The film created"
           schema:
             $ref: '#/definitions/Film'
-        405:
+        "405":
           description: "Invalid input"
 definitions:
       Actor:

project/swagger/swagger.yaml

@@ -1,6 +1,6 @@
 Flask-SQLAlchemy==2.4.4
 SQLAlchemy==1.3.19
 Flask-Script==2.0.6
-py-ms[all]==2.6.0
+py-ms[all]==2.6.1
 marshmallow==3.8.0
 marshmallow-sqlalchemy==0.23.1

requirements.txt

@@ -0,0 +1,5 @@
+[aliases]
+test=pytest
+
+[tool:pytest]
+addopts = --cov=project --cov=tests tests/

setup.cfg

@@ -38,6 +38,10 @@
     platforms=["any"],
     keywords="python, microservices",
     url='https://github.com/python-microservices/microservices-scaffold',
-    packages=find_packages(),
+    packages=find_packages(
+        exclude=['*.tests', '*.tests.*', 'tests.*', 'tests', '*.examples', '*.examples.*', 'examples.*', 'examples']),
+    setup_requires=[
+        'pytest-runner>=2.0,<3dev',
+    ],
     include_package_data=True,
 )