Skip to content

Commit 9b39c4f

Browse files
Merge pull request #39 from maximlt/support_python_39
2 parents 9b4a738 + eb488ea commit 9b39c4f

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
fail-fast: false
3939
matrix:
4040
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
41-
python-version: ["3.5", "3.6", "3.7", "3.8"]
41+
python-version: ["3.5", "3.6", "3.7", "3.8", "3.9"]
4242
steps:
4343
- uses: actions/checkout@v2
4444
- uses: conda-incubator/setup-miniconda@v2
@@ -55,4 +55,4 @@ jobs:
5555
uses: codecov/codecov-action@v1
5656
with:
5757
file: ./cov.xml
58-
env_vars: OS,PYTHON
58+
env_vars: OS,PYTHON

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The package is available for all Mac, Linux, and Windows on my conda channel. Py
1414

1515
Tranquilizer can be used with either Jupyter Notebooks (`.ipynb`) or Python script files (`.py`).
1616

17-
The decorated function below will be served as an end point called `cheese` with the GET method. The
17+
The decorated function below will be served as an end point called `order` with the GET method. The
1818
function must return a JSON serializable object.
1919

2020
See the [complete description of `@tranquilize()`](#tranquilize-decorator) below.
@@ -28,7 +28,7 @@ def order(cheese):
2828
return "I'm afraid we're fresh out of {}, Sir.".format(cheese)
2929
```
3030

31-
The REST API is served by [Flask](http://flask.pocoo.org/) and [Flask-RESTX](https://flask-restx.readthedocs.io/en/latest/)
31+
The REST API is served by [Flask](https://flask.palletsprojects.com) and [Flask-RESTX](https://flask-restx.readthedocs.io/en/latest/)
3232
using the `tranquilizer` command.
3333

3434

@@ -64,7 +64,7 @@ Out[3]: '"I\'m afraid we\'re fresh out of cheddar, Sir."\n'
6464
The *tranquilized* API is documented with [Swagger](https://swagger.io/tools/open-source/) and is accessible
6565
in your web browser at [http://localhost:8086](http://localhost:8086).
6666

67-
![](img/swagger.png)
67+
![](https://raw.githubusercontent.com/ContinuumIO/tranquilizer/9b4a738d1f24af7f4c2397d43454e0fe2ee5e86b/img/swagger.png)
6868

6969
## Tranquilize Decorator
7070

conda.recipe/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ build:
1717

1818
requirements:
1919
run:
20-
- python >=3.5, <3.9
20+
- python >=3.5, <3.10
2121
- flask
2222
- werkzeug >=0.15, <2.0
2323
- python-dateutil
2424
- flask-restx
2525
- flask-cors
2626
build:
27-
- python >=3.5, <3.9
27+
- python >=3.5, <3.10
2828
- setuptools
2929

3030
test:

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ addopts =
1313
--cov-report=term-missing
1414
--cov-report=xml:cov.xml
1515
--tb native
16-
--strict
16+
--strict-markers
1717
--durations=20
1818
env =
1919
PYTHONHASHSEED=0

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"Intended Audience :: Developers",
5353
"Environment :: Web Environment"
5454
],
55-
python_requires=">=3.5, <3.9",
55+
python_requires=">=3.5, <3.10",
5656
install_requires=install_requires,
5757
extras_require=extras_require,
5858
include_package_data=True,

tranquilizer/decorator.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
from inspect import signature
22
import re
33

4-
PARAM_REGEX = re.compile(":param (?P<name>[\*\w]+): (?P<doc>.*?)"
5-
"(?:(?=:param)|(?=:return)|(?=:raises)|\Z)", re.S)
6-
RAISE_REGEX = re.compile(":raise[s]? (?P<name>[\*\w]+): (?P<doc>.*?)"
7-
"(?:(?=:param)|(?=:return)|(?=:raise[s]?)|\Z)", re.S)
4+
PARAM_REGEX = re.compile(r":param (?P<name>[\*\w]+): (?P<doc>.*?)"
5+
r"(?:(?=:param)|(?=:return)|(?=:raises)|\Z)", re.S)
6+
RAISE_REGEX = re.compile(r":raise[s]? (?P<name>[\*\w]+): (?P<doc>.*?)"
7+
r"(?:(?=:param)|(?=:return)|(?=:raise[s]?)|\Z)", re.S)
88

99
def _prepare_arg(arg):
1010
'''Return a keyword arg spec (dict)'''

0 commit comments

Comments
 (0)