Skip to content

Commit 86f6d84

Browse files
committed
Merge remote-tracking branch 'origin/master' into os/generic-dataclasses
2 parents 7ab7b52 + a6be7f0 commit 86f6d84

File tree

14 files changed

+656
-94
lines changed

14 files changed

+656
-94
lines changed

.github/workflows/python-package.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,35 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
python_version: ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"]
14+
python_version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "pypy3.9"]
1515

1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818
- name: Set up Python ${{ matrix.python-version }}
19-
uses: actions/setup-python@v2
19+
uses: actions/setup-python@v4
2020
with:
2121
python-version: ${{ matrix.python_version }}
2222
- name: set pre-commit cache
23-
uses: actions/cache@v2
23+
uses: actions/cache@v3
2424
with:
2525
path: |
2626
~/.cache/pre-commit
2727
~/.cache/pip
2828
key: ${{ matrix.python_version }}-${{ hashFiles('.pre-commit-config.yaml') }}-${{ hashFiles('setup.py') }}
29+
30+
- name: Use latest pip
31+
run: python -m pip install --upgrade pip
32+
- name: Pre-install PyYAML without --pre
33+
if: ${{ startsWith(matrix.python_version, 'pypy') }}
34+
# Temporary workaround:
35+
# PyYAML fails to build with Cython 3.0.0a
36+
# see https://github.com/yaml/pyyaml/issues/601
37+
run: pip install PyYAML
2938
- name: Install dependencies
30-
run: |
31-
python -m pip install --upgrade pip
32-
pip install --pre -e '.[dev]'
39+
run: pip install --pre -e '.[dev]'
40+
3341
- name: Pre-commit hooks
3442
if: ${{ matrix.python_version != 'pypy3' && matrix.python_version != '3.6' }}
3543
run: pre-commit run --all-files
3644
- name: Test with pytest
3745
run: pytest
38-
env:
39-
PYTHONWARNINGS: error

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1515
- name: Set up Python
16-
uses: actions/setup-python@v2
16+
uses: actions/setup-python@v4
1717
with:
1818
python-version: '3.x'
1919
- name: Install dependencies

.pre-commit-config.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
repos:
22
- repo: https://github.com/asottile/pyupgrade
3-
rev: v2.32.0
3+
rev: v3.2.0
44
hooks:
55
- id: pyupgrade
66
args: ["--py36-plus"]
77
- repo: https://github.com/python/black
8-
rev: 22.3.0
8+
rev: 22.10.0
99
hooks:
1010
- id: black
1111
language_version: python3
1212
- repo: https://gitlab.com/pycqa/flake8
13-
rev: 3.9.2
13+
rev: 5.0.4
1414
hooks:
1515
- id: flake8
16-
additional_dependencies: ['flake8-bugbear==19.8.0']
16+
additional_dependencies: ['flake8-bugbear==22.10.27']
1717
- repo: https://github.com/pre-commit/mirrors-mypy
18-
rev: v0.942
18+
rev: v0.982
1919
hooks:
2020
- id: mypy
2121
additional_dependencies: [marshmallow-enum,typeguard,marshmallow]
@@ -24,4 +24,4 @@ repos:
2424
rev: v1.12.1
2525
hooks:
2626
- id: blacken-docs
27-
additional_dependencies: [black==19.3b0]
27+
additional_dependencies: [black==22.8.0]

CHANGELOG.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,51 @@
11
# marshmallow\_dataclass change log
22

3+
## v8.5.10 (2022-11-09)
4+
5+
- We now test under python version 3.11 (as well as 3.6 through 3.10). ([#220][])
6+
7+
- Recognize the variable-length, homogeneous tuple types `Tuple[T,
8+
...]` (and `tuple[T, ...]` under python >= 3.8). These are
9+
equivalent to the previously recognized `Sequence[T]`. ([#221][])
10+
11+
- Recognize PEP 604, `T | U`, union notation (requires python >=
12+
3.10). Fixes [#194][]. ([#219][])
13+
14+
[#181]: https://github.com/lovasoa/marshmallow_dataclass/issues/181
15+
[#194]: https://github.com/lovasoa/marshmallow_dataclass/issues/194
16+
[#219]: https://github.com/lovasoa/marshmallow_dataclass/pull/219
17+
[#220]: https://github.com/lovasoa/marshmallow_dataclass/pull/220
18+
[#221]: https://github.com/lovasoa/marshmallow_dataclass/pull/221
19+
20+
## v8.5.9 (2022-10-04)
21+
22+
- Fix [#206][]: NewType breakage with `typing-inspect>=0.8.0`
23+
([#207][], [#211][])
24+
- Fix tests for python 3.11 ([#212][])
25+
26+
[#206]: https://github.com/lovasoa/marshmallow_dataclass/issues/206
27+
[#207]: https://github.com/lovasoa/marshmallow_dataclass/pull/207
28+
[#211]: https://github.com/lovasoa/marshmallow_dataclass/pull/211
29+
[#212]: https://github.com/lovasoa/marshmallow_dataclass/pull/212
30+
31+
## v8.5.7, v8.5.8
32+
33+
- Fix https://github.com/lovasoa/marshmallow_dataclass/issues/190
34+
35+
## v8.5.6
36+
37+
- Fix bug introduced in previous release. See https://github.com/lovasoa/marshmallow_dataclass/pull/189
38+
39+
## v8.5.5
40+
41+
- Fix slowdown introduced in v8.5.4. See https://github.com/lovasoa/marshmallow_dataclass/pull/187
42+
43+
## v8.5.4
44+
45+
- Add support for the Final type. See [#150](https://github.com/lovasoa/marshmallow_dataclass/pull/150) and [#151](https://github.com/lovasoa/marshmallow_dataclass/pull/151)
46+
- Add support for [forward references](https://peps.python.org/pep-0484/#forward-references) and [ Postponed Evaluation of Annotations](https://peps.python.org/pep-0563/). (See [#13](https://github.com/lovasoa/marshmallow_dataclass/issues/13))
47+
- update dependencies
48+
349
## v8.5.3
450

551
- Fix spurious `ValueError` when defining a Union field with explicit default value

0 commit comments

Comments
 (0)