From 287ddd8b12fb779fe1c91210c87599ec24d03f1e Mon Sep 17 00:00:00 2001 From: Steven Loria Date: Tue, 20 Oct 2020 23:54:28 -0400 Subject: [PATCH] Drop Python 3.5 and test against 3.9 (#125) * Drop Python 3.5 and test against 3.9 * tox -e lint --- .pre-commit-config.yaml | 2 +- CHANGELOG.rst | 5 +++++ azure-pipelines.yml | 4 ++-- setup.py | 6 +++--- tests/test_one_of_schema.py | 2 +- tox.ini | 2 +- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c1e71a0..a171b3b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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: diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4b0d468..a4f62b8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -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) ++++++++++++++++++ diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b7bbb33..6f9a543 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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 diff --git a/setup.py b/setup.py index 450cbeb..054c7c6 100644 --- a/setup.py +++ b/setup.py @@ -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", ], ) diff --git a/tests/test_one_of_schema.py b/tests/test_one_of_schema.py index 4931ef0..adbebe8 100644 --- a/tests/test_one_of_schema.py +++ b/tests/test_one_of_schema.py @@ -51,7 +51,7 @@ def __init__(self, value1=None, value2=None): self.value2 = value2 def __repr__(self): - return "".format(self.value1, self.value2) + return f"" def __eq__(self, other): return ( diff --git a/tox.ini b/tox.ini index df48198..fa7f047 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ envlist= lint check-build - py{35,36,37,38} + py{36,37,38,39} [testenv] extras = tests