From 460f1324ce489cfd7d9a38636420242ac616e52b Mon Sep 17 00:00:00 2001
From: Luke Bakken <lbakken@pivotal.io>
Date: Thu, 30 Jun 2022 06:25:56 -0700
Subject: [PATCH] Use pyproject.toml only

Fixes #1372
---
 pyproject.toml | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-
 setup.cfg      | 53 --------------------------------------------
 2 files changed, 59 insertions(+), 54 deletions(-)
 delete mode 100644 setup.cfg

diff --git a/pyproject.toml b/pyproject.toml
index fed528d4..767c92eb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,3 +1,61 @@
 [build-system]
-requires = ["setuptools"]
+requires = ["setuptools>=61.2"]
 build-backend = "setuptools.build_meta"
+
+[project]
+name = "pika"
+version = "1.3.0rc1"
+maintainers = [{name = "Gavin M. Roy", email = "gavinmroy@gmail.com"}]
+license = {text = "BSD-3-Clause"}
+description = "Pika Python AMQP Client Library"
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: BSD License",
+    "Natural Language :: English",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.4",
+    "Programming Language :: Python :: 3.5",
+    "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 :: Implementation :: CPython",
+    "Programming Language :: Python :: Implementation :: Jython",
+    "Programming Language :: Python :: Implementation :: PyPy",
+    "Topic :: Communications",
+    "Topic :: Internet",
+    "Topic :: Software Development :: Libraries",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Topic :: System :: Networking",
+]
+dependencies = []
+
+[project.readme]
+file = "README.rst"
+content-type = "text/x-rst"
+
+[project.urls]
+Homepage = "https://pika.readthedocs.io"
+Source = "https://github.com/pika/pika"
+
+[project.optional-dependencies]
+gevent = ["gevent"]
+tornado = ["tornado"]
+twisted = ["twisted"]
+
+[tool.setuptools]
+zip-safe = true
+include-package-data = false
+
+[tool.setuptools.packages.find]
+include = ["pika"] # pika.*
+namespaces = false
+
+[tool.setuptools.package-data]
+"*" = ["LICENSE", "README.rst"]
+
+[tool.distutils.bdist_wheel]
+universal = 1
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 586a35fc..00000000
--- a/setup.cfg
+++ /dev/null
@@ -1,53 +0,0 @@
-[metadata]
-name = pika
-version = 1.3.0rc1
-maintainer = Gavin M. Roy
-maintainer_email = gavinmroy@gmail.com
-license = BSD-3-Clause
-description = Pika Python AMQP Client Library
-url = https://pika.readthedocs.io
-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
-    Natural Language :: English
-    Operating System :: OS Independent
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.4
-    Programming Language :: Python :: 3.5
-    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 :: Implementation :: CPython
-    Programming Language :: Python :: Implementation :: Jython
-    Programming Language :: Python :: Implementation :: PyPy
-    Topic :: Communications
-    Topic :: Internet
-    Topic :: Software Development :: Libraries
-    Topic :: Software Development :: Libraries :: Python Modules
-    Topic :: System :: Networking
-project_urls =
-    Source = https://github.com/pika/pika
-
-[options]
-zip_safe = True
-packages = find:
-install_requires =
-
-[bdist_wheel]
-universal = 1
-
-[options.packages.find]
-include = pika; pika.*
-
-[options.extras_require]
-gevent = gevent
-tornado = tornado
-twisted = twisted
-
-[options.package_data]
-* = LICENSE, README.rst