Use declarative build config as much as possible

sebastinas · sebastinas · commit f3cc2204b87d · 2021-02-13T15:45:13.000+01:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,9 @@
+[build-system]
+requires = [
+  "setuptools >= 43",
+  "wheel",
+]
+
 [tool.black]
 line-length = 80
 target_version = ["py36"]
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,43 @@
 [metadata]
-license_files = LICENSE
+name = bpython
+long_description = file: README.rst
+license = MIT
+license_file = LICENSE
+url = https://www.bpython-interpreter.org/
+project_urls =
+    GitHub = https://github.com/bpython/bpython
+    Documentation = https://doc.bpython-interpreter.org
+classifiers =
+    Programming Language :: Python :: 3
+
+[options]
+python_requires = >=3.6
+packages =
+    bpython
+    bpython.curtsiesfrontend
+    bpython.test
+    bpython.test.fodder
+    bpython.translations
+    bpdb
+install_requires =
+    pygments
+    requests
+    curtsies >=0.3.5
+    greenlet
+    cwcwidth
+    pyxdg
+
+[options.extras_require]
+urwid = urwid
+watch = watchdog
+jedi = jedi >= 0.16
+
+[options.entry_points]
+console_scripts =
+    bpython = bpython.curtsies:main
+    bpython-curses = bpython.cli:main
+    bpython-urwid = bpython.urwid:main [urwid]
+    bpdb = bpdb:main
 
 [init_catalog]
 domain = bpython
diff --git a/setup.py b/setup.py
@@ -170,43 +170,6 @@ def git_describe_to_python_version(version):
 ]
 data_files.extend(man_pages)
 
-classifiers = [
-    "Programming Language :: Python :: 3",
-]
-
-install_requires = [
-    "pygments",
-    "requests",
-    "curtsies >=0.3.5",
-    "greenlet",
-    "cwcwidth",
-    "pyxdg",
-]
-
-extras_require = {
-    "urwid": ["urwid"],
-    "watch": ["watchdog"],
-    "jedi": ["jedi >=0.16"],
-}
-
-packages = [
-    "bpython",
-    "bpython.curtsiesfrontend",
-    "bpython.test",
-    "bpython.test.fodder",
-    "bpython.translations",
-    "bpdb",
-]
-
-entry_points = {
-    "console_scripts": [
-        "bpython = bpython.curtsies:main",
-        "bpython-curses = bpython.cli:main",
-        "bpython-urwid = bpython.urwid:main [urwid]",
-        "bpdb = bpdb:main",
-    ]
-}
-
 # translations
 mo_files = []
 for language in os.listdir(translations_dir):
@@ -215,27 +178,15 @@ def git_describe_to_python_version(version):
         mo_files.append(mo_subpath)
 
 setup(
-    name="bpython",
     version=version,
     author=__author__,
     author_email="robertanthonyfarrell@gmail.com",
-    description="Fancy Interface to the Python Interpreter",
-    license="MIT/X",
-    url="https://www.bpython-interpreter.org/",
-    long_description="""bpython is a fancy interface to the Python
-    interpreter for Unix-like operating systems.""",
-    classifiers=classifiers,
-    python_requires=">=3.6",
-    install_requires=install_requires,
-    extras_require=extras_require,
-    packages=packages,
     data_files=data_files,
     package_data={
         "bpython": ["sample-config"],
         "bpython.translations": mo_files,
         "bpython.test": ["test.config", "test.theme"],
     },
-    entry_points=entry_points,
     cmdclass=cmdclass,
     test_suite="bpython.test",
 )
