From 4d864b9a850bc486847118e52e33ebb1ad5a3ced Mon Sep 17 00:00:00 2001 From: Mark Murnane Date: Sun, 21 Apr 2024 23:53:30 -0400 Subject: [PATCH] Removing sideboard imports --- Dockerfile | 3 ++- conftest.py | 1 - magwest/__init__.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 conftest.py diff --git a/Dockerfile b/Dockerfile index 613ad0c..ec602b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ FROM ghcr.io/magfest/ubersystem:main +ENV uber_plugins=["magwest"] # install plugins COPY . plugins/magwest/ -RUN /app/env/bin/paver install_deps +RUN uv pip install --system -r plugins/magwest/requirements.txt \ No newline at end of file diff --git a/conftest.py b/conftest.py deleted file mode 100644 index 4a79fe1..0000000 --- a/conftest.py +++ /dev/null @@ -1 +0,0 @@ -import sideboard diff --git a/magwest/__init__.py b/magwest/__init__.py index c535152..458a300 100644 --- a/magwest/__init__.py +++ b/magwest/__init__.py @@ -1,14 +1,14 @@ from os.path import join +from pathlib import Path -from sideboard.lib import parse_config -from uber.config import c +from uber.config import c, parse_config from uber.jinja import template_overrides from uber.utils import mount_site_sections, static_overrides from magwest._version import __version__ # noqa: F401 -config = parse_config(__file__) +config = parse_config("magwest", Path(__file__).parents[0]) c.include_plugin_config(config) mount_site_sections(config['module_root']) static_overrides(join(config['module_root'], 'static'))