tmux-python · tony · Sep 10, 2022 · Sep 10, 2022 · Sep 10, 2022 · Sep 10, 2022
diff --git a/CHANGES b/CHANGES
@@ -23,6 +23,7 @@ $ pip install --user --upgrade --pre libtmux
 - Fixes #402: {func}`common.tmux_cmd` will only strip _trailing_ empty lines. Before this change,
   all empty lines were filtered out. This will lead to a more accurate behavior when using
   {meth}`Pane.capture_pane`. Credit: @rockandska, via #405.
+- Source files for `libtmux` modules moved to `src/`, via #414.
 
 ### Development
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -11,13 +11,14 @@
 # Get the project root dir, which is the parent dir of this
 cwd = Path(__file__).parent
 project_root = cwd.parent
+project_src = project_root / "src"
 
-sys.path.insert(0, str(project_root))
+sys.path.insert(0, str(project_src))
 sys.path.insert(0, str(cwd / "_ext"))
 
 # package data
 about: Dict[str, str] = {}
-with open(project_root / "libtmux" / "__about__.py") as fp:
+with open(project_src / "libtmux" / "__about__.py") as fp:
     exec(fp.read(), about)
 
 extensions = [

diff --git a/pyproject.toml b/pyproject.toml
@@ -27,7 +27,7 @@ keywords = ["tmux", "session manager", "terminal", "ncurses"]
 homepage = "http://github.com/tmux-python/libtmux/"
 readme = "README.md"
 packages = [
-  { include = "libtmux" },
+  { include = "*", from = "src" },
 ]
 include = [
   { path = "CHANGES", format = "sdist" },

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [flake8]
-exclude = .*/,*.egg,libtmux/_compat.py,libtmux/__*__.py
+exclude = .*/,*.egg,src/libtmux/_compat.py,src/libtmux/__*__.py
 select = E,W,F,N
 max-line-length = 88
 # Stuff we ignore thanks to black: https://github.com/ambv/black/issues/429
@@ -22,6 +22,6 @@ filterwarnings =
 addopts = --tb=short --no-header --showlocals --doctest-docutils-modules --reruns 2 -p no:doctest
 doctest_optionflags = ELLIPSIS NORMALIZE_WHITESPACE
 testpaths =
-	libtmux
+	src/libtmux
 	tests
 	docs
diff --git a/libtmux/__about__.py → src/libtmux/__about__.py b/libtmux/__about__.py → src/libtmux/__about__.py
diff --git a/libtmux/__init__.py → src/libtmux/__init__.py b/libtmux/__init__.py → src/libtmux/__init__.py
diff --git a/libtmux/_compat.py → src/libtmux/_compat.py b/libtmux/_compat.py → src/libtmux/_compat.py
diff --git a/libtmux/common.py → src/libtmux/common.py b/libtmux/common.py → src/libtmux/common.py
diff --git a/libtmux/conftest.py → src/libtmux/conftest.py b/libtmux/conftest.py → src/libtmux/conftest.py
diff --git a/libtmux/exc.py → src/libtmux/exc.py b/libtmux/exc.py → src/libtmux/exc.py
diff --git a/libtmux/formats.py → src/libtmux/formats.py b/libtmux/formats.py → src/libtmux/formats.py
diff --git a/libtmux/pane.py → src/libtmux/pane.py b/libtmux/pane.py → src/libtmux/pane.py
diff --git a/libtmux/py.typed → src/libtmux/py.typed b/libtmux/py.typed → src/libtmux/py.typed
diff --git a/libtmux/pytest_plugin.py → src/libtmux/pytest_plugin.py b/libtmux/pytest_plugin.py → src/libtmux/pytest_plugin.py
diff --git a/libtmux/server.py → src/libtmux/server.py b/libtmux/server.py → src/libtmux/server.py
diff --git a/libtmux/session.py → src/libtmux/session.py b/libtmux/session.py → src/libtmux/session.py
diff --git a/libtmux/test.py → src/libtmux/test.py b/libtmux/test.py → src/libtmux/test.py
diff --git a/libtmux/window.py → src/libtmux/window.py b/libtmux/window.py → src/libtmux/window.py