Skip to content

Commit e10f94d

Browse files
authored
Merge branch 'master' into pyup-update-flask-opentracing-0.2.0-to-1.0.0
2 parents 268ad55 + c7e0d66 commit e10f94d

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

AUTHORS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
Alberto Vara <a.vara.1986@gmail.com>
2-
jmrivas <jmrivas@paradigmadigital.com>
2+
Hugo Camino <hcamino@paradigmadigital.com>
3+
José Manuel <jmrivas86@gmail.com>

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@
66
[![Requirements Status](https://requires.io/github/python-microservices/pyms/requirements.svg?branch=master)](https://requires.io/github/python-microservices/pyms/requirements/?branch=master)
77
[![Updates](https://pyup.io/repos/github/python-microservices/pyms/shield.svg)](https://pyup.io/repos/github/python-microservices/pyms/)
88
[![Python 3](https://pyup.io/repos/github/python-microservices/pyms/python-3-shield.svg)](https://pyup.io/repos/github/python-microservices/pyms/)
9+
[![Total alerts](https://img.shields.io/lgtm/alerts/g/python-microservices/pyms.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/python-microservices/pyms/alerts/)
10+
[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/python-microservices/pyms.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/python-microservices/pyms/context:python)
11+
912

1013
## Installation
1114
```bash
1215
pip install py-ms
13-
```
16+
```

requirements-tests.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-r requirements.txt # includes the base requirements file
2-
coverage==4.5.1
2+
coverage==4.5.2
33
mock==2.0.0
44
nose==1.3.7
55
pylint==2.1.1

requirements.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
jaeger-client==3.12.0
22
python-json-logger==0.1.10
33
PyYAML==3.13
4+
anyconfig==0.9.7
45
# Optionals:
5-
connexion==2.0.1
6+
connexion[swagger-ui]==2.0.2
7+
# Necessary to deploy swagger ui files in projects that install this library,
8+
# connexion's extra it isn't working as expected in that case
9+
swagger-ui-bundle==0.0.2
610
flask==1.0.2
7-
Flask-OpenTracing==1.0.0
8-
anyconfig==0.9.7
9-
connexion[swagger-ui]==2.0.1
11+
Flask-OpenTracing==1.0.0

0 commit comments

Comments
 (0)