From f86162927bc9a8624fd44e74f107cd4850cc7df1 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Sat, 24 Sep 2022 08:28:12 -0500
Subject: [PATCH 1/4] build: Move conftest.py to root of package

This way, it won't be included in the package wheel by default.

Neither include nor exclude in poetry 1.2.1 seem to allow negating
src/tmuxp/conftest.py from being included in the wheel.
---
 src/tmuxp/conftest.py => conftest.py | 0
 tests/conftest.py                    | 1 -
 2 files changed, 1 deletion(-)
 rename src/tmuxp/conftest.py => conftest.py (100%)
 delete mode 100644 tests/conftest.py

diff --git a/src/tmuxp/conftest.py b/conftest.py
similarity index 100%
rename from src/tmuxp/conftest.py
rename to conftest.py
diff --git a/tests/conftest.py b/tests/conftest.py
deleted file mode 100644
index 44a43177266..00000000000
--- a/tests/conftest.py
+++ /dev/null
@@ -1 +0,0 @@
-from tmuxp.conftest import *  # noqa F40

From 83ada271a03eb9f711545828593c6ea7b128a291 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Sat, 24 Sep 2022 08:35:23 -0500
Subject: [PATCH 2/4] build(conftest.py): Include in sdist

---
 pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyproject.toml b/pyproject.toml
index 43aeae50bf7..a68f19c30ac 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,6 +32,7 @@ include = [
   { path = "tests", format = "sdist" },
   { path = "examples", format = "sdist" },
   { path = "docs", format = "sdist" },
+  { path = "conftest.py", format = "sdist" },
 ]
 
 [tool.poetry.urls]

From 26160c58e7520d4eda669061c11e18700f73d926 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Sat, 24 Sep 2022 08:41:16 -0500
Subject: [PATCH 3/4] docs(conftest.py): Note root-level

---
 conftest.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/conftest.py b/conftest.py
index b753bdd9e84..368f68fdc2b 100644
--- a/conftest.py
+++ b/conftest.py
@@ -1,3 +1,8 @@
+"""Conftest.py (root-level)
+
+We keep this in root pytest fixtures in pytest's doctest plugin to be available, as well
+as avoiding conftest.py from being included in the wheel.
+"""
 import logging
 import os
 import pathlib

From f957aa2bfa81dda3b82a3d3e0b7a60bb0639ea1f Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Sat, 24 Sep 2022 08:41:31 -0500
Subject: [PATCH 4/4] docs(CHANGES): Note conftest.py update

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

diff --git a/CHANGES b/CHANGES
index 1294dcecb2f..22fd604d666 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,14 @@ $ pipx install --suffix=@next 'tmuxp' --pip-args '\--pre' --force
 
 - _Insert changes/features/fixes for next release here_
 
+## tmuxp 1.15.2 (unreleased)
+
+**Maintenance release, no features or fixes**
+
+### Packaging
+
+- Move conftest.py to root, to avoid packaging in wheel (#826 vs #825)
+
 ## tmuxp 1.15.1 (2022-09-23)
 
 **Maintenance release, no features or fixes**