Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase from sideboard to uber #453

Merged
merged 4 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
ARG BRANCH=main
FROM ghcr.io/magfest/ubersystem:${BRANCH}
ENV uber_plugins=["magprime"]

# install plugins
COPY . plugins/magprime/

RUN /app/env/bin/paver install_deps
RUN uv pip install --system -r plugins/magprime/requirements.txt
2 changes: 0 additions & 2 deletions conftest.py

This file was deleted.

6 changes: 3 additions & 3 deletions magprime/config.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from sideboard.lib import parse_config, request_cached_property
from collections import defaultdict
from datetime import timedelta
from pathlib import Path

from uber.config import c, Config, dynamic
from uber.config import c, Config, dynamic, parse_config
from uber.menu import MenuItem
from uber.utils import localized_now

config = parse_config(__file__)
config = parse_config("magprime", Path(__file__).parents[0])
c.include_plugin_config(config)

@Config.mixin
Expand Down
1 change: 1 addition & 0 deletions magprime/configspec.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ url = string(default="")

[dates]
superstar_deadline = string(default="2023-12-01")
rock_island_merch_deadline = string(default="2023-12-01")

[enums]
[[special_merch]]
Expand Down
1 change: 0 additions & 1 deletion requirements_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
pytest>=3.0.1
mock>=1.0.1,<1.1
coverage>=3.6
-e "git+https://github.com/magfest/sideboard#egg=sideboard"
-e "git+https://github.com/magfest/ubersystem#egg=uber"
Empty file removed test-defaults.ini
Empty file.
56 changes: 0 additions & 56 deletions tox.ini

This file was deleted.

Loading