Skip to content

Commit

Permalink
Merge branch 'release/0.3.23' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
erikvw committed Aug 21, 2024
2 parents acda403 + 9a85cdf commit 2e23fcf
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
12 changes: 8 additions & 4 deletions meta_edc/__init__.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
import os
import sys
from importlib.metadata import PackageNotFoundError, version

from .celery.debug import app as celery_debug
from .celery.live import app as celery_live
from .celery.uat import app as celery_uat
if "meta_edc.celery.live:app" in sys.argv:
from .celery.live import app as celery_app
elif "meta_edc.celery.uat:app" in sys.argv:
from .celery.uat import app as celery_app
else:
from .celery.debug import app as celery_app

try:
__version__ = version(os.getcwd().split(os.sep)[-1])
except PackageNotFoundError:
__version__ = None


__all__ = ["celery_live", "celery_uat", "celery_debug", "__version__"]
__all__ = ["celery_app", "__version__"]
2 changes: 1 addition & 1 deletion meta_edc/wsgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

from django.core.wsgi import get_wsgi_application

os.environ.setdefault("DJANGO_SETTINGS_MODULE", "meta_edc.settings.debug")
os.environ["DJANGO_SETTINGS_MODULE"] = "meta_edc.settings.debug"

application = get_wsgi_application()
2 changes: 1 addition & 1 deletion meta_edc/wsgi_live.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

from django.core.wsgi import get_wsgi_application

os.environ.setdefault("DJANGO_SETTINGS_MODULE", "meta_edc.settings.live")
os.environ["DJANGO_SETTINGS_MODULE"] = "meta_edc.settings.live"

application = get_wsgi_application()
2 changes: 1 addition & 1 deletion meta_edc/wsgi_uat.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

from django.core.wsgi import get_wsgi_application

os.environ.setdefault("DJANGO_SETTINGS_MODULE", "meta_edc.settings.uat")
os.environ["DJANGO_SETTINGS_MODULE"] = "meta_edc.settings.uat"

application = get_wsgi_application()

0 comments on commit 2e23fcf

Please sign in to comment.