Skip to content

Develop #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jan 12, 2020
Merged

Develop #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
640b3d7
Update coverage from 4.5.4 to 5.0
pyup-bot Dec 15, 2019
30c8a32
Update sqlalchemy from 1.3.11 to 1.3.12
pyup-bot Dec 17, 2019
fc587c0
Updated PyMS to 2.0.0rc1
avara1986 Dec 19, 2019
53af6ce
Merge remote-tracking branch 'origin/pyup-update-sqlalchemy-1.3.11-to…
avara1986 Dec 19, 2019
a66f2bb
Merge remote-tracking branch 'origin/pyup-update-coverage-4.5.4-to-5.…
avara1986 Dec 19, 2019
721bced
Update sqlalchemy from 1.3.11 to 1.3.12
pyup-bot Dec 19, 2019
7f93230
Updated tests and docker config
avara1986 Dec 19, 2019
a4874cd
Update tox from 3.14.2 to 3.14.3
pyup-bot Dec 29, 2019
bdfa64f
Update coveralls from 1.9.2 to 1.10.0
pyup-bot Dec 31, 2019
796cc44
Update coverage from 4.5.4 to 5.0.2
pyup-bot Jan 7, 2020
c15b717
Merge remote-tracking branch 'origin/pyup-update-sqlalchemy-1.3.11-to…
avara1986 Jan 12, 2020
b6ba8fe
Merge branch 'pyup-update-coverage-4.5.4-to-5.0.2' into develop
avara1986 Jan 12, 2020
8feb224
Merge remote-tracking branch 'origin/pyup-update-coveralls-1.9.2-to-1…
avara1986 Jan 12, 2020
c274103
Merge remote-tracking branch 'origin/pyup-update-tox-3.14.2-to-3.14.3…
avara1986 Jan 12, 2020
390bc8e
Increment pyms version
avara1986 Jan 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions config-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
39 changes: 20 additions & 19 deletions config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions requirements-tests.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
37 changes: 19 additions & 18 deletions tests/config-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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