Moved static files and celery.py

src/MANIFEST.in

@@ -1,5 +1,6 @@
 include LICENSE
 include README.rst
+recursive-include pretix/static *
 recursive-include pretix/static.dist *
 recursive-include pretix/locale *
 recursive-include pretix/base/templates *

src/pretix/base/__init__.py

@@ -12,7 +12,7 @@ class PretixBaseConfig(AppConfig):
         from .services import export, mail, tickets, cart, orders, cleanup  # NOQA
 
         try:
-            from .celery import app as celery_app  # NOQA
+            from .celery_app import app as celery_app  # NOQA
         except ImportError:
             pass
 

src/pretix/base/services/async.py

@@ -15,7 +15,7 @@ import time
 from django.conf import settings
 from django.db import transaction
 
-from pretix.celery import app
+from pretix.celery_app import app
 
 
 class ProfiledTask(app.Task):

src/pretix/base/services/cart.py

@@ -12,7 +12,7 @@ from pretix.base.models import (
 )
 from pretix.base.services.async import ProfiledTask
 from pretix.base.services.locking import LockTimeoutException
-from pretix.celery import app
+from pretix.celery_app import app
 
 
 class CartError(LazyLocaleException):

src/pretix/base/services/export.py

@@ -6,7 +6,7 @@ from pretix.base.i18n import language
 from pretix.base.models import CachedFile, Event, cachedfile_name
 from pretix.base.services.async import ProfiledTask
 from pretix.base.signals import register_data_exporters
-from pretix.celery import app
+from pretix.celery_app import app
 
 
 @app.task(base=ProfiledTask)

src/pretix/base/services/invoices.py

@@ -25,7 +25,7 @@ from pretix.base.i18n import LazyI18nString, language
 from pretix.base.models import Invoice, InvoiceAddress, InvoiceLine, Order
 from pretix.base.services.async import TransactionAwareTask
 from pretix.base.signals import register_payment_providers
-from pretix.celery import app
+from pretix.celery_app import app
 from pretix.helpers.database import rolledback_transaction
 
 

src/pretix/base/services/mail.py

@@ -12,7 +12,7 @@ from inlinestyler.utils import inline_css
 
 from pretix.base.i18n import LazyI18nString, language
 from pretix.base.models import Event, Order
-from pretix.celery import app
+from pretix.celery_app import app
 from pretix.multidomain.urlreverse import build_absolute_uri
 
 logger = logging.getLogger('pretix.base.mail')

src/pretix/base/services/orders.py

@@ -32,7 +32,7 @@ from pretix.base.services.mail import SendMailException, mail
 from pretix.base.signals import (
     order_paid, order_placed, periodic_task, register_payment_providers,
 )
-from pretix.celery import app
+from pretix.celery_app import app
 from pretix.multidomain.urlreverse import build_absolute_uri
 
 error_messages = {

src/pretix/base/services/tickets.py

@@ -8,7 +8,7 @@ from pretix.base.i18n import language
 from pretix.base.models import CachedTicket, Event, Order, OrderPosition
 from pretix.base.services.async import ProfiledTask
 from pretix.base.signals import register_ticket_outputs
-from pretix.celery import app
+from pretix.celery_app import app
 from pretix.helpers.database import rolledback_transaction
 
 

src/pretix/base/views/async.py

@@ -8,7 +8,7 @@ from django.http import JsonResponse
 from django.shortcuts import redirect, render
 from django.utils.translation import ugettext as _
 
-from pretix.celery import app
+from pretix.celery_app import app
 
 logger = logging.getLogger('pretix.base.async')
 

src/pretix/plugins/banktransfer/tasks.py

@@ -14,7 +14,7 @@ from pretix.base.services.async import TransactionAwareTask
 from pretix.base.services.locking import LockTimeoutException
 from pretix.base.services.mail import SendMailException
 from pretix.base.services.orders import mark_order_paid
-from pretix.celery import app
+from pretix.celery_app import app
 
 from .models import BankImportJob, BankTransaction
 

src/pretix/presale/style.py

@@ -10,7 +10,7 @@ from django.core.files.storage import default_storage
 
 from pretix.base.models import Event
 from pretix.base.services.async import ProfiledTask
-from pretix.celery import app
+from pretix.celery_app import app
 
 logger = logging.getLogger('pretix.presale.style')
 

src/pretix/settings.py

@@ -340,10 +340,10 @@ STATICFILES_FINDERS = (
 )
 
 STATICFILES_DIRS = [
-    os.path.join(BASE_DIR, 'static')
-] if os.path.exists(os.path.join(BASE_DIR, 'static')) else []
+    os.path.join(BASE_DIR, 'pretix/static')
+] if os.path.exists(os.path.join(BASE_DIR, 'pretix/static')) else []
 
-STATICI18N_ROOT = os.path.join(BASE_DIR, "static")
+STATICI18N_ROOT = os.path.join(BASE_DIR, "pretix/static")
 
 STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'