Skip to content

Commit 8ee0c52

Browse files
authored
Merge pull request #9 from AdCombo/freeze-marshmallow-jsonapi-version-fix-tests
Freeze marshmallow-jsonapi version, fix badges in README
2 parents f345b0d + b83f2db commit 8ee0c52

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

README.rst

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
.. image:: https://badge.fury.io/py/Flask-REST-JSONAPI.svg
2-
:target: https://badge.fury.io/py/Flask-REST-JSONAPI
3-
.. image:: https://travis-ci.org/miLibris/flask-rest-jsonapi.svg
4-
:target: https://travis-ci.org/miLibris/flask-rest-jsonapi
5-
.. image:: https://coveralls.io/repos/github/miLibris/flask-rest-jsonapi/badge.svg
6-
:target: https://coveralls.io/github/miLibris/flask-rest-jsonapi
7-
.. image:: https://readthedocs.org/projects/flask-rest-jsonapi/badge/?version=latest
8-
:target: http://flask-rest-jsonapi.readthedocs.io/en/latest/?badge=latest
9-
:alt: Documentation Status
1+
.. image:: https://travis-ci.org/AdCombo/flask-rest-jsonapi.svg
2+
:target: https://travis-ci.org/AdCombo/flask-rest-jsonapi
3+
.. image:: https://coveralls.io/repos/github/AdCombo/flask-rest-jsonapi/badge.svg
4+
:target: https://coveralls.io/github/AdCombo/flask-rest-jsonapi
5+
106

117
Flask-REST-JSONAPI
128
##################

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
simplejson
22
Flask>=1.0.1
33
marshmallow==3.2.1
4-
marshmallow_jsonapi>=0.22.0
4+
marshmallow_jsonapi==0.22.0
55
apispec>=2.0.2
66
sqlalchemy

0 commit comments

Comments
 (0)