Merge pull request #182 from cmu-delphi/development

Removed Celery

Author: dmytrotsko

Pipfile

@@ -5,11 +5,9 @@ name = "pypi"
 
 [packages]
 'sentry-sdk[django]' = "*"
-celery = {version = "*", extras = ["redis"]}
 coverage = "*"
 crispy-bootstrap5 = "*"
 django = "*"
-django-celery-beat = "*"
 django-cors-headers = "*"
 django-coverage-plugin = "*"
 django-crispy-forms = "*"

Pipfile.lock

@@ -63,52 +63,7 @@ services:
     depends_on:
       - sdwebapp
 
-  celery:
-    build: .
-    env_file:
-      - ./.env
-    container_name: signal_documentation-celery
-    working_dir: /usr/src/signal_documentation/src
-    command: celery -A signal_documentation worker -l info
-    volumes:
-      - .:/usr/src/signal_documentation
-    depends_on:
-      - db
-      - redis
-
-  celery-beat:
-    build: .
-    env_file:
-      - ./.env
-    container_name: signal_documentation-celery-beat
-    working_dir: /usr/src/signal_documentation/src
-    command: celery -A signal_documentation beat -l info
-    volumes:
-      - .:/usr/src/signal_documentation
-    depends_on:
-      - db
-      - redis
-
-  flower:
-    build: .
-    env_file:
-      - ./.env
-    image: mher/flower
-    container_name: signal_documentation-flower
-    working_dir: /usr/src/signal_documentation/src
-    command: celery -A signal_documentation flower -l info
-    volumes:
-      - .:/usr/src/signal_documentation
-    ports:
-      - "5555:5555"
-    depends_on:
-      - redis
-      - celery
-      - celery-beat
-
 volumes:
   mysql:
   sdwebapp:
   static:
-  celery:
-  celery-beat:

docker-compose.yaml

@@ -7,7 +7,6 @@ attrs==23.2.0; python_version >= '3.7'
 babel==2.14.0; python_version >= '3.7'
 beautifulsoup4==4.12.3; python_full_version >= '3.6.0'
 billiard==4.2.0; python_version >= '3.7'
-celery[redis]==5.3.6
 certifi==2024.2.2; python_version >= '3.6'
 cfgv==3.4.0; python_version >= '3.8'
 charset-normalizer==3.3.2; python_full_version >= '3.7.0'
@@ -23,7 +22,6 @@ defusedxml==0.7.1; python_version >= '2.7' and python_version not in '3.0, 3.1,
 diff-match-patch==20230430; python_version >= '3.7'
 distlib==0.3.8
 django==4.2.10
-django-celery-beat==2.5.0
 django-cors-headers==4.3.1
 django-coverage-plugin==3.1.0
 django-crispy-forms==2.1

requirements.txt

@@ -30,13 +30,13 @@
 SENTRY_DSN = os.environ.get('SENTRY_DSN')
 if SENTRY_DSN:
     sentry_sdk.init(
-        dsn = SENTRY_DSN,
-        integrations = [DjangoIntegration(), RedisIntegration(max_data_size=0)],
-        traces_sample_rate = float(os.environ.get('SENTRY_TRACES_SAMPLE_RATE', 1.0)),
-        profiles_sample_rate = float(os.environ.get('SENTRY_PROFILES_SAMPLE_RATE', 1.0)),
-        environment = (os.environ.get('SENTRY_ENVIRONMENT', 'development')),
-        attach_stacktrace = os.environ.get('SENTRY_ATTACH_STACKTRACE', 'False').lower() in ('true', '1', 't'),
-        debug = os.environ.get('SENTRY_DEBUG', 'False').lower() in ('true', '1', 't')
+        dsn=SENTRY_DSN,
+        integrations=[DjangoIntegration(), RedisIntegration(max_data_size=0)],
+        traces_sample_rate=float(os.environ.get('SENTRY_TRACES_SAMPLE_RATE', 1.0)),
+        profiles_sample_rate=float(os.environ.get('SENTRY_PROFILES_SAMPLE_RATE', 1.0)),
+        environment=(os.environ.get('SENTRY_ENVIRONMENT', 'development')),
+        attach_stacktrace=os.environ.get('SENTRY_ATTACH_STACKTRACE', 'False').lower() in ('true', '1', 't'),
+        debug=os.environ.get('SENTRY_DEBUG', 'False').lower() in ('true', '1', 't')
     )
 
 
@@ -263,17 +263,6 @@
 
 CACHE_TIME = int(os.environ.get('CACHE_TIME', 60 * 60 * 24))  # 24 hours
 
-
-# Celery
-# https://docs.celeryq.dev/en/stable/index.html
-CELERY_BROKER_URL = f"{REDIS_URL}{REDIS_DB}"
-
-CELERY_RESULT_BACKEND = CELERY_BROKER_URL
-CELERY_ACCEPT_CONTENT = ['application/json']
-CELERY_RESULT_SERIALIZER = 'json'
-CELERY_TASK_SERIALIZER = 'json'
-
-
 # Password validation
 # https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators