Skip to content
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

Jump to bottom

Add python 3.9 to CI. #3785

Merged
merged 3 commits into from
Nov 1, 2020
Merged

Add python 3.9 to CI. #3785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7646752
test Python 3.9
tirkarthi Oct 10, 2020
1c6dc15
fix response bases order
davidism Nov 1, 2020
2676973
remove pre-commit job, using pre-commit.ci now
davidism Nov 1, 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
12 changes: 6 additions & 6 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ jobs:
fail-fast: false
matrix:
include:
- {name: Linux, python: '3.8', os: ubuntu-latest, tox: py38}
- {name: Windows, python: '3.8', os: windows-latest, tox: py38}
- {name: Mac, python: '3.8', os: macos-latest, tox: py38}
- {name: Linux, python: '3.9', os: ubuntu-latest, tox: py39}
- {name: Windows, python: '3.9', os: windows-latest, tox: py39}
- {name: Mac, python: '3.9', os: macos-latest, tox: py39}
- {name: '3.8', python: '3.8', os: ubuntu-latest, tox: py38}
- {name: '3.7', python: '3.7', os: ubuntu-latest, tox: py37}
- {name: '3.6', python: '3.6', os: ubuntu-latest, tox: py36}
- {name: 'PyPy', python: pypy3, os: ubuntu-latest, tox: pypy3}
- {name: Version Range, python: '3.8', os: ubuntu-latest, tox: 'devel'}
- {name: Style, python: '3.8', os: ubuntu-latest, tox: style}
- {name: Docs, python: '3.8', os: ubuntu-latest, tox: docs}
- {name: Version Range, python: '3.9', os: ubuntu-latest, tox: 'devel'}
- {name: Docs, python: '3.9', os: ubuntu-latest, tox: docs}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
Expand Down
2 changes: 1 addition & 1 deletion src/flask/wrappers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def _load_form_data(self):
attach_enctype_error_multidict(self)


class Response(ResponseBase, JSONMixin):
class Response(JSONMixin, ResponseBase):
"""The response object that is used by default in Flask. Works like the
response object from Werkzeug but is set to have an HTML mimetype by
default. Quite often you don't have to create this object yourself because
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py{38,37,36,py3}
py{39,38,37,36,py3}
py38-devel
style
docs
Expand Down