From 3ba4d974f05b990b5fa15b1f9196325a130ffe00 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Sun, 1 Oct 2023 09:13:10 -0500
Subject: [PATCH 1/2] packaging(pytest): Move configuration to pyproject.toml

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

diff --git a/pyproject.toml b/pyproject.toml
index e76d3719d59..fd1da5dde6b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -184,6 +184,18 @@ combine-as-imports = true
 "src/tmuxp/cli/*.py" = ["PTH"]
 "docs/_ext/aafig.py" = ["PTH"]
 
+[tool.pytest.ini_options]
+addopts = "--reruns=0 --tb=short --no-header --showlocals --doctest-modules"
+doctest_optionflags = "ELLIPSIS NORMALIZE_WHITESPACE"
+testpaths = [
+  "src/tmuxp",
+  "tests",
+  "docs",
+]
+filterwarnings = [
+  "ignore:The frontend.Option(Parser)? class.*:DeprecationWarning::",
+]
+
 [build-system]
 requires = ["poetry_core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index db80d22fb15..00000000000
--- a/setup.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-[tool:pytest]
-filterwarnings = 
-	ignore:The frontend.Option(Parser)? class.*:DeprecationWarning::
-addopts = --reruns=0 --tb=short --no-header --showlocals --doctest-modules
-doctest_optionflags = ELLIPSIS NORMALIZE_WHITESPACE
-testpaths =
-	src/tmuxp
-	tests
-	docs

From 46ae26149f71a66bf151ac736bc2a5065d94cd12 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Sun, 1 Oct 2023 09:39:28 -0500
Subject: [PATCH 2/2] docs(CHANGES): Note pytest configuration in
 pyproject.toml

---
 CHANGES | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES b/CHANGES
index 79adfcc949e..3163d2eca98 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,10 @@ $ pipx install --suffix=@next 'tmuxp' --pip-args '\--pre' --force
 
 <!-- Maintainers, insert changes / features for the next release here -->
 
+### Packaging
+
+- Move pytest configuration to `pyproject.toml` (#886)
+
 ## tmuxp 1.31.0 (2023-09-23)
 
 ### Breaking changes