Merge pull request #310 from bluetech/rm-python35

Remove support for Python 3.5, add Python 3.9, move metadata from setup.py to setup.cfg, mark as Mature

Author: bluetech

.github/workflows/main.yml

@@ -19,16 +19,15 @@ jobs:
       fail-fast: false
       matrix:
         name: [
-          "windows-py35",
           "windows-py36",
-          "windows-py37",
+          "windows-py39",
           "windows-pypy3",
 
-          "ubuntu-py35",
           "ubuntu-py36",
           "ubuntu-py36-pytestmain",
           "ubuntu-py37",
           "ubuntu-py38",
+          "ubuntu-py39",
           "ubuntu-pypy3",
           "ubuntu-benchmark",
 
@@ -37,27 +36,18 @@ jobs:
         ]
 
         include:
-          - name: "windows-py35"
-            python: "3.5"
-            os: windows-latest
-            tox_env: "py35"
           - name: "windows-py36"
             python: "3.6"
             os: windows-latest
             tox_env: "py36"
-          - name: "windows-py37"
-            python: "3.7"
+          - name: "windows-py39"
+            python: "3.9"
             os: windows-latest
-            tox_env: "py37"
+            tox_env: "py39"
           - name: "windows-pypy3"
             python: "pypy3"
             os: windows-latest
             tox_env: "pypy3"
-          - name: "ubuntu-py35"
-            python: "3.5"
-            os: ubuntu-latest
-            tox_env: "py35"
-            use_coverage: true
           - name: "ubuntu-py36"
             python: "3.6"
             os: ubuntu-latest
@@ -78,6 +68,11 @@ jobs:
             os: ubuntu-latest
             tox_env: "py38"
             use_coverage: true
+          - name: "ubuntu-py39"
+            python: "3.9"
+            os: ubuntu-latest
+            tox_env: "py39"
+            use_coverage: true
           - name: "ubuntu-pypy3"
             python: "pypy3"
             os: ubuntu-latest

changelog/308.removal.rst

@@ -0,0 +1 @@
+Remove official support for Python 3.5.

changelog/309.feature.rst

@@ -0,0 +1 @@
+Add official support for Python 3.9.

pyproject.toml

@@ -5,6 +5,9 @@ requires = [
   "wheel",
 ]
 
+[tool.setuptools_scm]
+write_to = "src/pluggy/_version.py"
+
 [tool.towncrier]
 package = "pluggy"
 package_dir = "src/pluggy"

setup.cfg

@@ -2,7 +2,50 @@
 universal=1
 
 [metadata]
-license_file=LICENSE
+name = pluggy
+description = plugin and hook calling mechanisms for python
+long_description = file: README.rst
+long_description_content_type = text/x-rst
+license = MIT
+platforms = unix, linux, osx, win32
+author = Holger Krekel
+author_email = [email protected]
+url = https://github.com/pytest-dev/pluggy
+classifiers =
+    Development Status :: 6 - Mature
+    Intended Audience :: Developers
+    License :: OSI Approved :: MIT License
+    Operating System :: POSIX
+    Operating System :: Microsoft :: Windows
+    Operating System :: MacOS :: MacOS X
+    Topic :: Software Development :: Testing
+    Topic :: Software Development :: Libraries
+    Topic :: Utilities
+    Programming Language :: Python :: Implementation :: CPython
+    Programming Language :: Python :: Implementation :: PyPy
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3 :: Only
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+
+[options]
+packages =
+    pluggy
+install_requires =
+    importlib-metadata>=0.12;python_version<"3.8"
+python_requires = >=3.6
+package_dir =
+    =src
+setup_requires =
+    setuptools-scm
+[options.extras_require]
+dev =
+    pre-commit
+    tox
+testing =
+    pytest
 
 [devpi:upload]
 formats=sdist.tgz,bdist_wheel

setup.py

@@ -1,52 +1,5 @@
 from setuptools import setup
 
-classifiers = [
-    "Development Status :: 4 - Beta",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: MIT License",
-    "Operating System :: POSIX",
-    "Operating System :: Microsoft :: Windows",
-    "Operating System :: MacOS :: MacOS X",
-    "Topic :: Software Development :: Testing",
-    "Topic :: Software Development :: Libraries",
-    "Topic :: Utilities",
-    "Programming Language :: Python :: Implementation :: CPython",
-    "Programming Language :: Python :: Implementation :: PyPy",
-    "Programming Language :: Python :: 3 :: Only",
-] + [("Programming Language :: Python :: %s" % x) for x in "3 3.5 3.6 3.7 3.8".split()]
-
-with open("README.rst", "rb") as fd:
-    long_description = fd.read().decode("utf-8")
-
-with open("CHANGELOG.rst", "rb") as fd:
-    long_description += "\n\n" + fd.read().decode("utf-8")
-
-EXTRAS_REQUIRE = {
-    "dev": ["pre-commit", "tox"],
-    "testing": ["pytest"],
-}
-
-
-def main():
-    setup(
-        name="pluggy",
-        description="plugin and hook calling mechanisms for python",
-        long_description=long_description,
-        use_scm_version={"write_to": "src/pluggy/_version.py"},
-        setup_requires=["setuptools-scm"],
-        license="MIT license",
-        platforms=["unix", "linux", "osx", "win32"],
-        author="Holger Krekel",
-        author_email="[email protected]",
-        url="https://github.com/pytest-dev/pluggy",
-        python_requires=">=3.5",
-        install_requires=['importlib-metadata>=0.12;python_version<"3.8"'],
-        extras_require=EXTRAS_REQUIRE,
-        classifiers=classifiers,
-        packages=["pluggy"],
-        package_dir={"": "src"},
-    )
-
 
 if __name__ == "__main__":
-    main()
+    setup()

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist=linting,docs,py{35,36,37,38,py3},py{36,37}-pytest{master}
+envlist=linting,docs,py{36,37,38,39,py3},py{36,37}-pytest{main}
 
 [testenv]
 commands=
@@ -18,7 +18,9 @@ deps=
 commands=pytest {posargs:testing/benchmark.py}
 deps=
   pytest
-  pytest-benchmark
+  # Once pytest lifts its pluggy<1.0 constraint, the pytest-benchmark
+  # constraint can be removed.
+  pytest-benchmark==3.1.1
 
 [testenv:linting]
 skip_install = true