Skip to content

Commit

Permalink
Drop Python 3.5 and test against 3.9 (marshmallow-code#125)
Browse files Browse the repository at this point in the history
* Drop Python 3.5 and test against 3.9

* tox -e lint
  • Loading branch information
sloria authored Oct 21, 2020
1 parent a17d5c1 commit 287ddd8
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ repos:
rev: v2.7.2
hooks:
- id: pyupgrade
args: [--py3-plus]
args: [--py36-plus]
- repo: https://github.com/python/black
rev: 20.8b1
hooks:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Changelog
---------

3.0.0 (unreleased)
++++++++++++++++++

- Only support Python>=3.6 and marshmallow>=3.0.0.

2.1.0 (2020-10-05)
++++++++++++++++++

Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ resources:
jobs:
- template: job--python-tox.yml@sloria
parameters:
toxenvs: [lint, py35, py36, py37, py38, check-build]
toxenvs: [lint, py36, py37, py38, py39, check-build]
os: linux
- template: job--pypi-release.yml@sloria
parameters:
python: "3.8"
python: "3.9"
distributions: "sdist bdist_wheel"
dependsOn:
- tox_linux
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@ def read(fname):
"demultiplexing",
"polymorphic",
],
python_requires=">=3.5",
install_requires=["marshmallow>=3.0.0rc6,<4.0.0"],
python_requires=">=3.6",
install_requires=["marshmallow>=3.0.0,<4.0.0"],
extras_require=EXTRAS_REQUIRE,
classifiers=[
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
],
)
2 changes: 1 addition & 1 deletion tests/test_one_of_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def __init__(self, value1=None, value2=None):
self.value2 = value2

def __repr__(self):
return "<Bar value1={} value2={}>".format(self.value1, self.value2)
return f"<Bar value1={self.value1} value2={self.value2}>"

def __eq__(self, other):
return (
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
envlist=
lint
check-build
py{35,36,37,38}
py{36,37,38,39}

[testenv]
extras = tests
Expand Down

0 comments on commit 287ddd8

Please sign in to comment.