8000 Merge pull request #107 from flask-api/update-flask · flask-api/flask-api@8727298 · GitHub
[go: up one dir, main page]

Skip to content

Commit 8727298

Browse files
authored
Merge pull request #107 from flask-api/update-flask
Test against the latest version of Flask
2 parents 209263c + 56232bd commit 8727298

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ env:
1717
- RANDOM_SEED=0
1818
matrix:
1919
- FLASK_VERSION=0.12.4
20-
- FLASK_VERSION=1.0.2
20+
- FLASK_VERSION=1.0.4
21+
- FLASK_VERSION=1.1.1
2122

2223
before_install:
2324
- pip install pipenv

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Browsable web APIs for Flask.
44

5-
[![Unix Build Status](https://img.shields.io/travis/flask-api/flask-api.svg)](https://travis-ci.org/flask-api/flask-api)
5+
[![Unix Build Status](https://img.shields.io/travis/flask-api/flask-api.svg)](https://travis-ci.org/flask-api/flask-api)
66
[![Coverage Status](https://img.shields.io/coveralls/flask-api/flask-api.svg)](https://coveralls.io/r/flask-api/flask-api)
77
[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/flask-api/flask-api.svg)](https://scrutinizer-ci.com/g/flask-api/flask-api/)
88
[![PyPI Version](https://img.shields.io/pypi/v/Flask-API.svg)](https://pypi.org/project/Flask-API/)
@@ -20,7 +20,7 @@ Flask API is a drop-in replacement for Flask that provides an implementation of
2020
Requirements:
2121

2222
* Python 2.7+ or 3.4+
23-
* Flask 0.12.3+
23+
* Flask 0.12.4+
2424

2525
Install using `pip`:
2626

@@ -46,7 +46,7 @@ def example():
4646
return {'hello': 'world'}
4747
```
4848

49-
A renderer for the response data will be selected using content negotiation based on the client 'Accept' header. If you're making the API request from a regular client, this will default to a JSON response. If you're viewing the API in a browser, it'll default to the browsable API HTML.
49+
A renderer for the response data will be selected using content negotiation based on the client 'Accept' header. If you're making the API request from a regular client, this will default to a JSON response. If you're viewing the API in a browser, it'll default to the browsable API HTML.
5050

5151
## Requests
5252

@@ -133,8 +133,8 @@ You can now open a new tab and interact with the API from the command line:
133133

134134
```shell
135135
$ curl -X GET http://127.0.0.1:5000/
136-
[{"url": "http://127.0.0.1:5000/0/", "text": "do the shopping"},
137-
{"url": "http://127.0.0.1:5000/1/", "text": "build the codez"},
136+
[{"url": "http://127.0.0.1:5000/0/", "text": "do the shopping"},
137+
{"url": "http://127.0.0.1:5000/1/", "text": "build the codez"},
138138
{"url": "http://127.0.0.1:5000/2/", "text": "paint the door"}]
139139

140140
$ curl -X GET http://127.0.0.1:5000/1/

0 commit comments

Comments
 (0)
0