Use namespace packaging so xonsh 0.12 loads correctly with pytest

Entrypoints are still used in 3.12, but load_xontrib() test fails if you're not using namespace packaging
Spitfire1900 · Mar 23, 2024 · 14029d6 · 14029d6
1 parent f75ad3c
commit 14029d6
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 1 deletion.
diff --git a/pyproject.toml b/pyproject.toml
@@ -21,7 +21,7 @@ content-type = "text/markdown"
 
 
 [project.entry-points."xonsh.xontribs"]
-"pygitstatus" = "xontrib_pygitstatus.main"
+"pygitstatus" = "xontrib.pygitstatus.entrypoint"
 
 
 [project.urls]

diff --git a/xontrib/pygitstatus/__init__.py b/xontrib/pygitstatus/__init__.py
@@ -0,0 +1 @@
+# This module is loaded by xontrib if no entrypoint is defined. -- https://xon.sh/tutorial_xontrib.html#structure
diff --git a/xontrib_pygitstatus/main.py → xontrib/pygitstatus/entrypoint.py b/xontrib_pygitstatus/main.py → xontrib/pygitstatus/entrypoint.py
@@ -10,6 +10,7 @@ def _load_xontrib_(xsh: XonshSession, **_):
     from .event_hooks import listen_cd
     xsh.builtins.events.on_chdir(listen_cd)
 
+
 def _unload_xontrib_(xsh: XonshSession, **kwargs) -> dict:
     """If you want your extension to be unloadable, put that logic here"""
     raise NotImplementedError('unload of pygitstatusnot implemented')
diff --git a/xontrib_pygitstatus/event_hooks.py → xontrib/pygitstatus/event_hooks.py b/xontrib_pygitstatus/event_hooks.py → xontrib/pygitstatus/event_hooks.py
diff --git a/xontrib_pygitstatus/__init__.py b/xontrib_pygitstatus/__init__.py
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# This module is loaded by xontrib if no entrypoint is defined. -- https://xon.sh/tutorial_xontrib.html#structure