From daa9ad6336b43138cde6e0ccb2d8f0edf44b402c Mon Sep 17 00:00:00 2001
From: James Stevenson <james.stevenson@nationwidechildrens.org>
Date: Wed, 11 Sep 2024 12:32:31 -0400
Subject: [PATCH] build: move remaining configs out of setup.cfg

---
 pyproject.toml | 33 +++++++++++++++++++++---------
 setup.cfg      | 55 --------------------------------------------------
 tox.ini        | 13 ++++++++++++
 3 files changed, 37 insertions(+), 64 deletions(-)
 delete mode 100644 setup.cfg

diff --git a/pyproject.toml b/pyproject.toml
index 69b4454..02f4cef 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,30 +24,46 @@ keywords = [
     "HGVS",
     "variation"
 ]
-dynamic = ["version", "optional-dependencies"]
-
+dynamic = ["version"]
 dependencies = [
     "attrs",
     "requests",
     "urllib3~=1.26",
 ]
 
+[project.optional-dependencies]
+dev = [
+    "bandit~=1.7",
+    "build~=0.8",
+    "flake8~=4.0",
+    "ipython~=8.4",
+    "isort~=5.10",
+    "mypy",
+    "pylint~=2.14",
+    "ruff == 0.4.4",
+]
+test = [
+    "pytest~=7.1",
+    "pytest-cov~=4.0",
+    "pytest-optional-tests",
+    "tox~=3.25",
+    "vcrpy",
+]
+docs = ["mkdocs"]
+
 [project.urls]
 "Homepage" = "https://github.com/biocommons/bioutils"
 "Bug Tracker" = "https://github.com/biocommons/bioutils/issues"
 
 [build-system]
-requires = [
-	 "setuptools >= 69.0",
-   	 "setuptools_scm[toml] >= 8.0"
-	 ]
+requires = ["setuptools >= 70.1", "setuptools_scm[toml] ~= 8.1"]
 build-backend = "setuptools.build_meta"
 
+[tool.setuptools.package-data]
+"*" = ["_data/*/*.json.gz"]
 
 [tool.setuptools_scm]
 
-
-# https://docs.pytest.org/en/6.2.x/customize.html#pyproject-toml
 [tool.pytest.ini_options]
 addopts = "-s -v -x --strict-markers -m 'not extra' --doctest-modules --cov=src"
 doctest_optionflags = [
@@ -65,7 +81,6 @@ testpaths = [
   "tests"
 ]
 
-
 [tool.coverage.run]
 branch = true
 source = ["biocommons.example"]
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 40cc960..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,55 +0,0 @@
-[metadata]
-name = bioutils
-
-[options]
-include_package_data = True
-packages = find_namespace:
-package_dir =
-    = src
-zip_safe = True
-
-[options.entry_points]
-#console_scripts =
-#    marvin-quote = biocommons.example.__main__:main
-
-[options.extras_require]
-dev =
-    bandit~=1.7
-    build~=0.8
-    flake8~=4.0
-    ipython~=8.4
-    isort~=5.10
-    mypy
-    pylint~=2.14
-    ruff == 0.4.4
-test =
-    pytest~=7.1
-    pytest-cov~=4.0
-    pytest-optional-tests
-    tox~=3.25
-    vcrpy
-docs =
-    mkdocs
-
-[options.packages.find]
-where = src
-exclude =
-    __pycache__
-    *.pyc
-
-[options.package_data]
-* =
-    _data/*/*.json.gz
-
-[flake8]
-ignore = E129,E133,E203,E221,E241,E251,E303,E266,H106,H904,W291
-max-line-length = 120
-max-complexity = 15
-hang-closing = true
-exclude =
-    .eggs
-    .tox
-    build
-    dist
-    docs/conf.py
-    tests/*
diff --git a/tox.ini b/tox.ini
index bc3fea1..a9331df 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,3 +10,16 @@ deps =
     pytest-cov
 whitelist_externals =
     make
+
+[flake8]
+ignore = E129,E133,E203,E221,E241,E251,E303,E266,H106,H904,W291
+max-line-length = 120
+max-complexity = 15
+hang-closing = true
+exclude =
+    .eggs
+    .tox
+    build
+    dist
+    docs/conf.py
+    tests/*