From 00e47b0443ee5be409f33af6171911fc875d2fa6 Mon Sep 17 00:00:00 2001
From: Matt Borgerson <contact@mborgerson.com>
Date: Tue, 27 May 2025 14:42:17 -0700
Subject: [PATCH 1/2] pyproject.toml: Migrate setup.cfg options

---
 pyproject.toml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 setup.cfg      | 36 ------------------------------------
 2 files changed, 48 insertions(+), 36 deletions(-)
 delete mode 100644 setup.cfg

diff --git a/pyproject.toml b/pyproject.toml
index 6395f25..191d12f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,6 +2,54 @@
 requires = ["setuptools>=46.4.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
+[project]
+name = "ailment"
+description = "The angr intermediate language."
+license = { text = "BSD-2-Clause" }
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+]
+requires-python = ">=3.10"
+dependencies = [
+    "typing-extensions",
+]
+dynamic = ["version"]
+
+[project.readme]
+file = "README.md"
+content-type = "text/markdown"
+
+[project.urls]
+Homepage = "https://api.angr.io/projects/ailment/en/latest/"
+Repository = "https://github.com/angr/ailment"
+
+[project.optional-dependencies]
+docs = [
+    "furo",
+    "myst-parser",
+    "sphinx",
+    "sphinx-autodoc-typehints",
+]
+testing = [
+    "pytest",
+    "pytest-xdist",
+]
+
+[tool.setuptools]
+include-package-data = true
+license-files = ["LICENSE"]
+
+[tool.setuptools.dynamic]
+version = { attr = "ailment.__version__" }
+
+[tool.setuptools.package-data]
+ailment = ["py.typed"]
+
 [tool.black]
 line-length = 120
 target-version = ['py310']
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 6fe749c..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-[metadata]
-name = ailment
-version = attr: ailment.__version__
-description = The angr intermediate language.
-long_description = file: README.md
-long_description_content_type = text/markdown
-url = https://github.com/angr/ailment
-license = BSD-2-Clause
-license_files = LICENSE
-classifiers =
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11
-    Programming Language :: Python :: 3.12
-    Programming Language :: Python :: 3.13
-
-[options]
-packages = find:
-install_requires =
-    typing-extensions
-python_requires = >=3.10
-
-[options.extras_require]
-docs =
-    furo
-    myst-parser
-    sphinx
-    sphinx-autodoc-typehints
-testing =
-    pytest
-    pytest-xdist
-
-[options.package_data]
-ailment =
-    py.typed

From b3d20aee7587b4930d37719610c43e057b96e524 Mon Sep 17 00:00:00 2001
From: Matt Borgerson <contact@mborgerson.com>
Date: Tue, 27 May 2025 14:42:33 -0700
Subject: [PATCH 2/2] pre-commit: Drop setup-cfg-fmt

---
 .pre-commit-config.yaml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b01384b..7f78901 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -42,12 +42,6 @@ repos:
 # Modifiers
 #
 
--   repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v2.8.0
-    hooks:
-    -   id: setup-cfg-fmt
-        args: ["--include-version-classifiers"]
-
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks: