Drop support for Python 3.6 (#250)

* Drop Python 3.6 support * Update changelog
sloria · Jan 30, 2022 · 6125f78 · 6125f78
1 parent 74e0edb
commit 6125f78
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,24 +1,24 @@
 repos:
 - repo: https://github.com/asottile/pyupgrade
-  rev: v2.11.0
+  rev: v2.31.0
   hooks:
   - id: pyupgrade
-    args: [--py36-plus]
+    args: [--py37-plus]
 - repo: https://github.com/python/black
-  rev: 20.8b1
+  rev: 22.1.0
   hooks:
   - id: black
     language_version: python3
 - repo: https://gitlab.com/pycqa/flake8
-  rev: 4.0.1
+  rev: 3.9.2
   hooks:
   - id: flake8
     additional_dependencies: [flake8-bugbear==21.9.2]
 - repo: https://github.com/asottile/blacken-docs
-  rev: v1.10.0
+  rev: v1.12.1
   hooks:
   - id: blacken-docs
-    additional_dependencies: [black==20.8b1]
+    additional_dependencies: [black==22.1.0]
 # Use a local hook to run mypy because the official hook runs mypy in a venv
 # that doesn't have dependencies or their type annotations installed.
 - repo: local

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 9.6.0 (unreleased)
+
+Other changes:
+
+- Drop support for EOL Python 3.6.
+
 ## 9.5.0 (2022-01-30)
 
 Features:

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -31,13 +31,13 @@ jobs:
     parameters:
       toxenvs:
         - lint
-        - py36-marshmallowlowest
+        - py37-marshmallowlowest
         - py310-marshmallow3
         - py310-marshmallowdev
       os: linux
   - template: job--pypi-release.yml@sloria
     parameters:
-      python: "3.9"
+      python: "3.10"
       distributions: "sdist bdist_wheel"
       dependsOn:
         - tox_windows

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,3 @@
 [tool.black]
 line-length = 110
-target-version = ['py36', 'py37', 'py38']
+target-version = ['py37', 'py38', 'py39', 'py310']
diff --git a/setup.py b/setup.py
@@ -1,4 +1,5 @@
 import re
+
 from setuptools import setup
 
 INSTALL_REQUIRES = ["marshmallow>=3.0.0", "python-dotenv"]
@@ -9,7 +10,7 @@
     "lint": ["flake8==4.0.1", "flake8-bugbear==21.9.2", "mypy==0.910", "pre-commit~=2.4"],
 }
 EXTRAS_REQUIRE["dev"] = EXTRAS_REQUIRE["tests"] + EXTRAS_REQUIRE["lint"] + ["tox"]
-PYTHON_REQUIRES = ">=3.6"
+PYTHON_REQUIRES = ">=3.7"
 
 
 def find_version(fname):
@@ -54,7 +55,6 @@ def read(fname):
         "License :: OSI Approved :: MIT License",
         "Natural Language :: English",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",

diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
 envlist=
     lint
-    py{36,37,38,39}-marshmallow{3,lowest}
-    py39-marshmallowdev
+    py{37,38,39,310}-marshmallow{3,lowest}
+    py310-marshmallowdev
 
 [testenv]
 extras = tests