merge template updates and refill vars

setup.py

@@ -2,46 +2,36 @@
 # -*- coding: utf-8 -*-
 import os
 
-from setuptools import find_packages, setup
+from setuptools import (
+    find_packages,
+    setup,
+)
 
 extras_require = {
+    "dev": [
+        "build>=0.9.0",
+        "bumpversion>=0.5.3",
+        "ipython",
+        "pre-commit>=3.4.0",
+        "tox>=4.0.0",
+        "twine",
+        "wheel",
+    ],
+    "docs": [
+        "sphinx>=6.0.0",
+        "sphinx_rtd_theme>=1.0.0",
+        "towncrier>=21,<22",
+    ],
     "test": [
-        "pytest>=4.6.3,<5.0.0",
-        "pytest-xdist>=1.30.0",
+        "pytest>=7.0.0",
+        "pytest-xdist>=2.4.0",
         "pytest-trio>=0.5.2",
         "factory-boy>=2.12.0,<3.0.0",
     ],
-    "lint": [
-        "flake8==3.7.9",  # flake8 is not semver: it has added new warnings at minor releases
-        "isort==4.3.21",
-        "mypy==0.780",  # mypy is not semver: it has added new warnings at minor releases
-        "mypy-protobuf==1.15",
-        "black==19.3b0",
-        "flake8-bugbear>=19.8.0,<20",
-        "docformatter>=1.3.1,<2",
-        "trio-typing~=0.5.0",
-    ],
-    "doc": [
-        "Sphinx>=2.2.1,<3",
-        "sphinx_rtd_theme>=0.4.3,<=1",
-        "towncrier>=19.2.0, <20",
-    ],
-    "dev": [
-        "bumpversion>=0.5.3,<1",
-        "pytest-watch>=4.1.0,<5",
-        "wheel",
-        "twine",
-        "ipython",
-        "setuptools>=36.2.0",
-        "tox>=3.13.2,<4.0.0",
-    ],
 }
 
 extras_require["dev"] = (
-    extras_require["dev"]
-    + extras_require["test"]
-    + extras_require["lint"]
-    + extras_require["doc"]
+    extras_require["dev"] + extras_require["docs"] + extras_require["test"]
 )
 
 fastecdsa = [
@@ -58,7 +48,6 @@ fastecdsa = [
     "fastecdsa==1.7.5;sys_platform!='win32'",
 ]
 
-
 with open("./README.md") as readme:
     long_description = readme.read()
 
@@ -93,21 +82,22 @@ setup(
     name="libp2p",
     # *IMPORTANT*: Don't manually change the version here. Use `make bump`, as described in readme
     version="0.1.5",
-    description="libp2p implementation written in python",
+    description="""libp2p: The Python implementation of the libp2p networking stack""",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    maintainer="The Ethereum Foundation",
-    maintainer_email="snakecharmers@ethereum.org",
+    author="The Ethereum Foundation",
+    author_email="snakecharmers@ethereum.org",
     url="https://github.com/libp2p/py-libp2p",
     include_package_data=True,
     install_requires=install_requires,
-    python_requires=">=3.6,<4",
+    python_requires=">=3.8, <4",
     extras_require=extras_require,
     py_modules=["libp2p"],
     license="MIT/APACHE2.0",
     zip_safe=False,
     keywords="libp2p p2p",
     packages=find_packages(exclude=["tests", "tests.*"]),
+    package_data={"libp2p": ["py.typed"]},
     classifiers=[
         "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",
@@ -115,8 +105,11 @@ setup(
         "License :: OSI Approved :: Apache Software 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",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
     ],
     platforms=["unix", "linux", "osx"],
 )