Skip to content

Commit 405b63b

Browse files
committed
Changed supported python versions to 3.8-3.12
1 parent c9d407c commit 405b63b

File tree

3 files changed

+9
-23
lines changed

3 files changed

+9
-23
lines changed

.github/workflows/python-package.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
os: ["ubuntu-latest"]
15-
python_version: ["3.7", "3.8", "3.9", "3.10", "3.11", "pypy3.10"]
16-
include:
17-
- os: "ubuntu-20.04"
18-
python_version: "3.6"
15+
python_version: ["3.8", "3.9", "3.10", "3.11", "3.12", "pypy3.10"]
1916

2017
runs-on: ${{ matrix.os }}
2118
steps:

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,10 @@ pip3 install marshmallow-dataclass
5656

5757
You may optionally install the following extras:
5858

59-
- `enum` : enum support for marshmallow versions <3.18 [marshmallow-enum](https://github.com/justanr/marshmallow_enum).
6059
- `union` : for translating python [`Union` types](https://docs.python.org/3/library/typing.html#typing.Union) to union fields.
6160

6261
```shell
63-
pip3 install "marshmallow-dataclass[enum,union]"
62+
pip3 install "marshmallow-dataclass[union]"
6463
```
6564

6665
### marshmallow 2 support

setup.py

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,17 @@
88
"Operating System :: OS Independent",
99
"License :: OSI Approved :: MIT License",
1010
"Programming Language :: Python",
11-
"Programming Language :: Python :: 3.6",
12-
"Programming Language :: Python :: 3.7",
1311
"Programming Language :: Python :: 3.8",
1412
"Programming Language :: Python :: 3.9",
1513
"Programming Language :: Python :: 3.10",
1614
"Programming Language :: Python :: 3.11",
15+
"Programming Language :: Python :: 3.12",
1716
"Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries",
1817
]
1918

2019
EXTRAS_REQUIRE = {
21-
"enum": [
22-
"marshmallow-enum; python_version < '3.7'",
23-
"marshmallow>=3.18.0,<4.0; python_version >= '3.7'",
24-
],
25-
"union": ["typeguard>=2.4.1,<5.0.0"],
20+
"union": ["typeguard~=4.0.0"],
2621
"lint": ["pre-commit~=2.17"],
27-
':python_version == "3.6"': ["dataclasses", "types-dataclasses<0.6.4"],
2822
"docs": ["sphinx"],
2923
"tests": [
3024
"pytest>=5.4",
@@ -34,8 +28,7 @@
3428
],
3529
}
3630
EXTRAS_REQUIRE["dev"] = (
37-
EXTRAS_REQUIRE["enum"]
38-
+ EXTRAS_REQUIRE["union"]
31+
EXTRAS_REQUIRE["union"]
3932
+ EXTRAS_REQUIRE["lint"]
4033
+ EXTRAS_REQUIRE["docs"]
4134
+ EXTRAS_REQUIRE["tests"]
@@ -56,15 +49,12 @@
5649
keywords=["marshmallow", "dataclass", "serialization"],
5750
classifiers=CLASSIFIERS,
5851
license="MIT",
59-
python_requires=">=3.6",
52+
python_requires=">=3.8",
6053
install_requires=[
61-
"marshmallow>=3.13.0,<4.0",
62-
"typing-inspect>=0.8.0,<1.0",
63-
# Need `Literal`
64-
"typing-extensions>=3.7.2; python_version < '3.8'",
54+
"marshmallow>=3.18.0,",
55+
"typing-inspect~=0.9.0",
6556
# Need `dataclass_transform(field_specifiers)`
66-
# NB: typing-extensions>=4.2.0 conflicts with python 3.6
67-
"typing-extensions>=4.2.0; python_version<'3.11' and python_version>='3.7'",
57+
"typing-extensions>=4.2.0; python_version<'3.11'",
6858
],
6959
extras_require=EXTRAS_REQUIRE,
7060
package_data={"marshmallow_dataclass": ["py.typed"]},

0 commit comments

Comments
 (0)