Skip to content

Merge staging into main #183

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

Merged
merged 16 commits into from
Jul 30, 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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "*"
Expand Down
1,139 changes: 613 additions & 526 deletions Pipfile.lock

Large diffs are not rendered by default.

45 changes: 0 additions & 45 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
2 changes: 0 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand Down
275 changes: 0 additions & 275 deletions src/assets/admin/css/autocomplete.css

This file was deleted.

Loading
Loading