fix: Bundle template configuration file next to code (#189)

* fix: Bundle template configuration file next to code

* fix: Bundle more assets

pyproject.toml

@@ -8,7 +8,9 @@ readme = "README.md"
 homepage = "https://github.com/hnicke/sodalite"
 repository = "https://github.com/hnicke/sodalite"
 include = [
-    "CHANGELOG.md", "docs/sodalite.conf",
+    "CHANGELOG.md", "copyright","sodalite.desktop",
+    "scripts/shell-integration.*",
+    "scripts/sodalite-open",
     "docs/sodalite.1.md", "docs/sodalite.1",
     "docs/sodalite-open.1.md", "docs/sodalite-open.1",
 ]

sodalite/core/config.py

@@ -21,6 +21,8 @@ class ConfigNotFound(Exception):
 
 _ENV_CONFIG_FILE = 'CONFIG_FILE'
 
+CONFIG_TEMPLATE = Path(__file__).parent.absolute() / 'sodalite.conf'
+
 
 @functools.cache
 def _config_file() -> Path:
@@ -37,7 +39,7 @@ def _config_file() -> Path:
             return config_file
         else:
             logger.info(f"Creating config file '{config_file}'")
-            shutil.copy(src=env.DOCS / 'sodalite.conf', dst=config_file)
+            shutil.copy(src=CONFIG_TEMPLATE, dst=config_file)
             return config_file
 
     raise ConfigNotFound()

sodalite/util/env.py

@@ -36,6 +36,3 @@
 dirs = [USER_DATA, USER_CONFIG, buffer]
 for directory in dirs:
     os.makedirs(directory, exist_ok=True)
-
-ROOT = Path(__file__).parent.parent.parent.absolute()
-DOCS = ROOT / 'docs'

tests/conftest.py

@@ -1,13 +1,14 @@
-from pathlib import Path
 from unittest.mock import Mock
 
 from _pytest.monkeypatch import MonkeyPatch
 from pytest import fixture
 
+from sodalite.core import config
+
 
 @fixture(autouse=True)
 def config_env_variable(monkeypatch: MonkeyPatch) -> None:
-    monkeypatch.setenv('CONFIG_FILE', str(Path('docs/sodalite.conf').absolute()))
+    monkeypatch.setenv('CONFIG_FILE', str(config.CONFIG_TEMPLATE))
 
 
 @fixture