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.

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

python 3.10 and try python 3.11.0-alpha.1 #159

Merged
merged 3 commits into from
Oct 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
#
# Please bump to the latest unreleased candidate
# when you come across this and have a moment to spare!
python-version: [3.6, 3.7, 3.8, 3.9, 3.10.0-beta.1]
python-version: [3.6, 3.7, 3.8, 3.9, 3.10.0]
steps:
- uses: actions/checkout@master
- name: set up Python ${{ matrix.python-version }}
Expand Down
6 changes: 5 additions & 1 deletion CHANGES
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
0.13.0 (unreleased)
0.13.0 (2021-10-21)
- Fixes to field default #151
- The default value for nested fields wasn't serialized.
- The default value for other fields may be a callable and in that case it shouldn't be emitted into the schema.
- set int to "integer" instead of "number" #152
- Added fields.IPInterface marshmallow field type to python types mapping #155
- 0.13.x is planned to be the last major release to officially support python 3.6
which is EOL in December 2021
- minimum supported version of marshmallow is currently 3.11.0 (technically this was
true as of 0.12.0 because of the use of fields.IPInterface
0.12.0 (2021-05-22)
- Add support for validate.Equal #135
- Added fields.IP marshmallow field type to python types mapping #137
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ or mobile device).

#### Installation

Requires python>=3.6 and marshmallow>=3. (For python 2 & marshmallow 2 support, please use marshmallow-jsonschema<0.11)
Requires python>=3.6 and marshmallow>=3.11. (For python 2 & marshmallow 2 support, please use marshmallow-jsonschema<0.11)

```
pip install marshmallow-jsonschema
Expand Down
10 changes: 5 additions & 5 deletions requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
coverage>=5.4
jsonschema>=3.2
pytest>=6.2.2
coverage>=6.0.2
jsonschema>=4
pytest>=6.2.5
pytest-cov
# Optional installs for the wheel, but always required for tests
marshmallow-enum
marshmallow-union
mypy>=0.800
mypy>=0.910

pre-commit~=2.6
pre-commit~=2.15
2 changes: 1 addition & 1 deletion requirements-tox.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
tox>=3.14.3
tox>=3.24.4
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
marshmallow>=3
marshmallow>=3.11
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def read(fname):

setup(
name="marshmallow-jsonschema",
version="0.12.0",
version="0.13.0",
description="JSON Schema Draft v7 (http://json-schema.org/)"
" formatting with marshmallow",
long_description=long_description,
Expand Down