From: David Lord <davidism@gmail.com>
Date: Wed, 1 Jul 2020 16:33:03 +0000 (-0700)
Subject: move metadata to setup.cfg
X-Git-Tag: 3.0.0rc1~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd41cacc5f0a41a44e8e6399283ca927f5386c80;p=thirdparty%2Fjinja.git

move metadata to setup.cfg
---

diff --git a/setup.cfg b/setup.cfg
index 5d3d02ee..a1bbe6a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,43 @@
 [metadata]
-license_file = LICENSE.rst
-long_description = file:README.rst
+name = Jinja2
+# Version needs regex in setup.py.
+url = https://palletsprojects.com/p/jinja
+project_urls =
+    Documentation = https://jinja.palletsprojects.com/
+    Code = https://github.com/pallets/jinja
+    Issue tracker = https://github.com/pallets/jinja/issues
+license = BSD-3-Clause
+license_files = LICENSE.rst
+author = Armin Ronacher
+author_email = armin.ronacher@active-4.com
+maintainer = Pallets
+maintainer_email = contact@palletsprojects.com
+description = A very fast and expressive template engine.
+long_description = file: README.rst
 long_description_content_type = text/x-rst
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Environment :: Web Environment
+    Intended Audience :: Developers
+    License :: OSI Approved :: BSD License
+    Operating System :: OS Independent
+    Programming Language :: Python
+    Topic :: Internet :: WWW/HTTP :: Dynamic Content
+    Topic :: Text Processing :: Markup :: HTML
+
+[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
+
+[options.entry_points]
+babel.extractors =
+    jinja2 = jinja2.ext:babel_extract[i18n]
 
 [tool:pytest]
 testpaths = tests
@@ -25,7 +61,8 @@ source =
 # F = flake8 pyflakes
 # W = pycodestyle warnings
 # B9 = bugbear opinions
-select = B, E, F, W, B9
+# ISC = implicit-str-concat
+select = B, E, F, W, B9, ISC
 ignore =
     # slice notation whitespace, invalid
     E203
diff --git a/setup.py b/setup.py
index f5ad968e..184023af 100644
--- a/setup.py
+++ b/setup.py
@@ -1,40 +1,14 @@
 import re
 
-from setuptools import find_packages
 from setuptools import setup
 
 with open("src/jinja2/__init__.py", "rt", encoding="utf8") as f:
     version = re.search(r'__version__ = "(.*?)"', f.read(), re.M).group(1)
 
+# Metadata goes in setup.cfg. These are here for GitHub's dependency graph.
 setup(
     name="Jinja2",
     version=version,
-    url="https://palletsprojects.com/p/jinja/",
-    project_urls={
-        "Documentation": "https://jinja.palletsprojects.com/",
-        "Code": "https://github.com/pallets/jinja",
-        "Issue tracker": "https://github.com/pallets/jinja/issues",
-    },
-    license="BSD-3-Clause",
-    maintainer="Pallets",
-    maintainer_email="contact@palletsprojects.com",
-    description="A very fast and expressive template engine.",
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "Environment :: Web Environment",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: BSD License",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python",
-        "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-        "Topic :: Text Processing :: Markup :: HTML",
-    ],
-    packages=find_packages("src"),
-    package_dir={"": "src"},
-    include_package_data=True,
-    python_requires=">=3.6",
     install_requires=["MarkupSafe>=1.1"],
     extras_require={"i18n": ["Babel>=2.1"]},
-    entry_points={"babel.extractors": ["jinja2 = jinja2.ext:babel_extract[i18n]"]},
 )