-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into topic/chriscummings/enable-build-cache
- Loading branch information
Showing
67 changed files
with
417 additions
and
99 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM python:3.8-slim-buster | ||
FROM python:3.12-slim-bookworm | ||
|
||
ENV PYTHONUNBUFFERED 1 | ||
ENV PYTHONDONTWRITEBYTECODE 1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
|
||
FROM python:3.8-slim-buster | ||
FROM python:3.12-slim-bookwork | ||
|
||
ENV PYTHONUNBUFFERED 1 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,38 +1,32 @@ | ||
pytz==2022.1 # https://github.com/stub42/pytz | ||
django-netfields==1.2.2 # https://pypi.org/project/django-netfields/ | ||
python-slugify==6.1.2 # https://github.com/un33k/python-slugify | ||
Pillow==9.1.1 # https://github.com/python-pillow/Pillow | ||
argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi | ||
whitenoise==6.2.0 # https://github.com/evansd/whitenoise | ||
celery==5.2.7 # pyup: < 6.0 # https://github.com/celery/celery | ||
django-celery-beat==2.3.0 # https://github.com/celery/django-celery-beat | ||
django-celery-beat # https://github.com/celery/django-celery-beat | ||
django-netfields # https://pypi.org/project/django-netfields/ | ||
flower==1.0.0 # https://github.com/mher/flower | ||
python-slugify==6.1.2 # https://github.com/un33k/python-slugify | ||
uvicorn[standard]==0.17.6 # https://github.com/encode/uvicorn | ||
asgiref~=3.5.0 # https://github.com/django/asgiref | ||
whitenoise==6.2.0 # https://github.com/evansd/whitenoise | ||
|
||
# Django | ||
# ------------------------------------------------------------------------------ | ||
channels==3.0.4 | ||
channels_redis==3.4.0 | ||
django-redis==5.3.0 | ||
django==3.2.13 # pyup: < 4.0 # https://www.djangoproject.com/ | ||
django-grip==3.4.0 | ||
django-eventstream==4.5.1 # https://github.com/fanout/django-eventstream | ||
crispy-bootstrap5==0.6 # https://github.com/django-crispy-forms/crispy-bootstrap5 | ||
django~=4.2 # https://www.djangoproject.com/ | ||
|
||
django-allauth==0.51.0 # https://github.com/pennersr/django-allauth | ||
django-environ==0.9.0 # https://github.com/joke2k/django-environ | ||
django-eventstream==4.5.1 # https://github.com/fanout/django-eventstream | ||
django-model-utils==4.2.0 # https://github.com/jazzband/django-model-utils | ||
django-allauth==0.51.0 # https://github.com/pennersr/django-allauth | ||
django-crispy-forms==1.14.0 # https://github.com/django-crispy-forms/django-crispy-forms | ||
crispy-bootstrap5==0.6 # https://github.com/django-crispy-forms/crispy-bootstrap5 | ||
django-redis==5.3.0 | ||
django-simple-history~=3.1.1 | ||
|
||
# Django REST Framework | ||
djangorestframework==3.13.1 # https://github.com/encode/django-rest-framework | ||
djangorestframework~=3.15 # https://github.com/encode/django-rest-framework | ||
django-cors-headers==3.13.0 # https://github.com/adamchainz/django-cors-headers | ||
# DRF-spectacular for api documentation | ||
drf-spectacular==0.22.1 # https://github.com/tfranzel/drf-spectacular | ||
drf-spectacular # https://github.com/tfranzel/drf-spectacular | ||
|
||
# OIDC | ||
# ------------------------------------------------------------------------------ | ||
mozilla_django_oidc==2.0.0 # https://github.com/mozilla/mozilla-django-oidc | ||
|
||
websockets~=10.3 | ||
django-simple-history~=3.1.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,4 @@ | ||
__version__ = "0.1.0" | ||
"""The Django project for Security Catch and Release Automation Manager (SCRAM).""" | ||
|
||
__version__ = "1.1.1" | ||
__version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace("-", ".", 1).split(".")]) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
""" | ||
To understand why this file is here, please read: | ||
To understand why this file is here, please read the CookieCutter documentation. | ||
http://cookiecutter-django.readthedocs.io/en/latest/faq.html#why-is-there-a-django-contrib-sites-directory-in-cookiecutter-django | ||
""" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
""" | ||
To understand why this file is here, please read: | ||
To understand why this file is here, please read the CookieCutter documentation. | ||
http://cookiecutter-django.readthedocs.io/en/latest/faq.html#why-is-there-a-django-contrib-sites-directory-in-cookiecutter-django | ||
""" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
"""Route Manager is the core app, and it handles adding and removing routes that will be blocked.""" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
"""The API, which leverages Django Request Framework.""" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.