drop support for Python 2.7 and 3.5

6 files changed, 43 insertions, 60 deletions

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 86e7010..2b4d41a 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -9,25 +9,18 @@ variables:
 
 strategy:
   matrix:
-    Python 3.8 Linux:
+    Linux:
       vmImage: ubuntu-latest
-    Python 3.8 Windows:
+    Windows:
       vmImage: windows-latest
-    Python 3.8 Mac:
+    Mac:
       vmImage: macos-latest
-    PyPy 3 Linux:
-      python.version: pypy3
-    Python 3.7 Linux:
+    Python 3.7:
       python.version: '3.7'
-    Python 3.6 Linux:
+    Python 3.6:
       python.version: '3.6'
-    Python 3.5 Linux:
-      python.version: '3.5'
-    Python 2.7 Linux:
-      python.version: '2.7'
-    Python 2.7 Windows:
-      vmImage: windows-latest
-      python.version: '2.7'
+    PyPy:
+      python.version: pypy3
     Docs:
       TOXENV: docs
     Style:
@@ -39,7 +32,7 @@ pool:
 steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: "$(python.version)"
+      versionSpec: $(python.version)
     displayName: Use Python $(python.version)
 
   - script: pip --disable-pip-version-check install -U tox
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 579fe9c..1931abf 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,10 +1,10 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.1.0
+    rev: v2.2.0
     hooks:
       - id: pyupgrade
   - repo: https://github.com/asottile/reorder_python_imports
-    rev: v2.0.0
+    rev: v2.2.0
     hooks:
       - id: reorder-python-imports
         args: ["--application-directories", "src"]
diff --git a/CHANGES.rst b/CHANGES.rst
index 1bb2866..dd337b9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,7 @@ Version 8.0
 
 Unreleased
 
+-   Drop support for Python 2 and 3.5.
 -   Adds a repr to Command, showing the command name for friendlier
     debugging. :issue:`1267`, :pr:`1295`
 -   Add support for distinguishing the source of a command line
diff --git a/setup.cfg b/setup.cfg
index c2d41cc..c0c4ecf 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,8 +1,34 @@
 [metadata]
-license_file = LICENSE.rst
+name = click
+version = attr: click.__version__
+url = https://palletsprojects.com/p/click/
+project_urls =
+    Documentation = https://click.palletsprojects.com/
+    Code = https://github.com/pallets/click
+    Issue tracker = https://github.com/pallets/click/issues
+license = BSD-3-Clause
+license_files = LICENSE.rst
+maintainer = Pallets
+maintainer_email = contact@palletsprojects.com
+description = Composable command line interface toolkit
+long_description = file: README.rst
+long_description_content_type = text/x-rst
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    License :: OSI Approved :: BSD License
+    Operating System :: OS Independent
+    Programming Language :: Python
 
-[bdist_wheel]
-universal = 1
+[options]
+packages = find:
+package_dir = = src
+include_package_data = true
+python_requires = >= 3.6
+# Dependencies are in setup.py for GitHub's dependency graph.
+
+[options.packages.find]
+where = src
 
 [tool:pytest]
 testpaths = tests
@@ -10,7 +36,7 @@ filterwarnings =
     error
 
 [coverage:run]
-branch = True
+branch = true
 source =
     src
     tests
diff --git a/setup.py b/setup.py
index a7af7f1..48bf7c0 100644
--- a/setup.py
+++ b/setup.py
@@ -1,40 +1,3 @@
-import io
-import re
-
-from setuptools import find_packages
 from setuptools import setup
 
-with io.open("README.rst", "rt", encoding="utf8") as f:
-    readme = f.read()
-
-with io.open("src/click/__init__.py", "rt", encoding="utf8") as f:
-    version = re.search(r'__version__ = "(.*?)"', f.read()).group(1)
-
-setup(
-    name="click",
-    version=version,
-    url="https://palletsprojects.com/p/click/",
-    project_urls={
-        "Documentation": "https://click.palletsprojects.com/",
-        "Code": "https://github.com/pallets/click",
-        "Issue tracker": "https://github.com/pallets/click/issues",
-    },
-    license="BSD-3-Clause",
-    maintainer="Pallets",
-    maintainer_email="contact@palletsprojects.com",
-    description="Composable command line interface toolkit",
-    long_description=readme,
-    packages=find_packages("src"),
-    package_dir={"": "src"},
-    include_package_data=True,
-    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*",
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: BSD License",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 3",
-    ],
-)
+setup(name="click")
diff --git a/tox.ini b/tox.ini
index beed51d..8f0044d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{38,37,36,35,27,py3,py}
+    py{38,37,36,py3}
     style
     docs
 skip_missing_interpreters = true