diff --git a/server/config/settings/base.py b/server/config/settings/base.py index 50e3000f..fac8ad73 100644 --- a/server/config/settings/base.py +++ b/server/config/settings/base.py @@ -580,7 +580,10 @@ if APP_ENVIRONMENT == "development": # django-extensions # ------------------------------------------------------------------------------ # https://django-extensions.readthedocs.io/en/latest/installation_instructions.html#configuration - INSTALLED_APPS += ["django_extensions"] # noqa F405 + INSTALLED_APPS += [ + "django_extensions", + # "django_watchfiles" + ] # noqa F405 if APP_ENVIRONMENT in ["production", "caprover"] or APP_ENVIRONMENT.startswith( "caprover" diff --git a/server/requirements/requirements-dev.in b/server/requirements/requirements-dev.in index 9cdfe6b5..65754d5a 100644 --- a/server/requirements/requirements-dev.in +++ b/server/requirements/requirements-dev.in @@ -1,8 +1,6 @@ -r requirements.in -Werkzeug[watchdog] # https://github.com/pallets/werkzeug ipdb # https://github.com/gotcha/ipdb -watchgod # https://github.com/samuelcolvin/watchgod pip-tools # Testing @@ -33,5 +31,8 @@ django-extensions # https://github.com/django-extensions/django-extensions django-coverage-plugin # https://github.com/nedbat/django_coverage_plugin pytest-django # https://github.com/pytest-dev/pytest-django +# django-watchfiles custom PR +https://github.com/q0w/django-watchfiles/archive/issue-1.zip + # code checking truffleHog diff --git a/server/requirements/requirements-dev.txt b/server/requirements/requirements-dev.txt index 4784184c..7874c512 100644 --- a/server/requirements/requirements-dev.txt +++ b/server/requirements/requirements-dev.txt @@ -7,7 +7,7 @@ anyascii==0.3.1 # via wagtail anyio==3.5.0 - # via watchgod + # via watchfiles appnope==0.1.2 # via ipython argon2-cffi==21.3.0 @@ -15,9 +15,7 @@ argon2-cffi==21.3.0 argon2-cffi-bindings==21.2.0 # via argon2-cffi asgiref==3.5.0 - # via - # django - # uvicorn + # via django astroid==2.11.2 # via pylint asttokens==2.0.5 @@ -35,10 +33,12 @@ backcall==0.2.0 # via ipython beautifulsoup4==4.9.3 # via wagtail -black==22.8.0 +black==22.10.0 # via # -r requirements-dev.in # ufmt +build==0.8.0 + # via pip-tools certifi==2021.10.8 # via # requests @@ -82,11 +82,12 @@ dill==0.3.4 # via pylint distlib==0.3.4 # via virtualenv -dj-database-url==0.5.0 +dj-database-url==1.0.0 # via -r requirements.in django==3.2.13 # via # -r requirements.in + # dj-database-url # django-cors-headers # django-csp # django-debug-toolbar @@ -100,6 +101,7 @@ django==3.2.13 # django-stubs-ext # django-taggit # django-treebeard + # django-watchfiles # djangorestframework # drf-spectacular # wagtail @@ -140,6 +142,8 @@ django-taggit==2.1.0 # via wagtail django-treebeard==4.5.1 # via wagtail +django-watchfiles @ https://github.com/q0w/django-watchfiles/archive/issue-1.zip + # via -r requirements-dev.in djangorestframework==3.13.1 # via # -r requirements.in @@ -222,9 +226,7 @@ libcst==0.4.7 # ufmt # usort markupsafe==2.1.1 - # via - # jinja2 - # werkzeug + # via jinja2 marshmallow==3.15.0 # via environs matplotlib-inline==0.1.3 @@ -253,6 +255,7 @@ openpyxl==3.0.9 # via tablib packaging==21.3 # via + # build # marshmallow # pytest # pytest-sugar @@ -264,7 +267,7 @@ pathspec==0.9.0 # black # trailrunner pep517==0.12.0 - # via pip-tools + # via build pexpect==4.8.0 # via ipython pickleshare==0.7.5 @@ -273,7 +276,7 @@ pillow==9.0.1 # via # -r requirements.in # wagtail -pip-tools==6.6.2 +pip-tools==6.9.0 # via -r requirements-dev.in platformdirs==2.5.1 # via @@ -318,7 +321,7 @@ pyparsing==3.0.7 # via packaging pyrsistent==0.18.1 # via jsonschema -pytest==7.1.1 +pytest==7.1.3 # via # -r requirements-dev.in # pytest-django @@ -403,6 +406,7 @@ toml==0.10.2 tomli==2.0.1 # via # black + # build # django-stubs # mypy # pep517 @@ -450,7 +454,7 @@ urllib3==1.26.9 # sentry-sdk usort==1.0.5 # via ufmt -uvicorn[standard]==0.17.6 +uvicorn[standard]==0.18.3 # via -r requirements.in uvloop==0.16.0 # via uvicorn @@ -465,11 +469,9 @@ wagtail-factories==2.0.1 # via -r requirements.in wagtail-localize==1.2.1 # via -r requirements.in -watchdog==2.1.9 - # via werkzeug -watchgod==0.8.2 +watchfiles==0.17.0 # via - # -r requirements-dev.in + # django-watchfiles # uvicorn wcwidth==0.2.5 # via prompt-toolkit @@ -477,8 +479,6 @@ webencodings==0.5.1 # via html5lib websockets==10.2 # via uvicorn -werkzeug[watchdog]==2.2.0 - # via -r requirements-dev.in wheel==0.37.1 # via pip-tools whitenoise==6.0.0 diff --git a/server/requirements/requirements.txt b/server/requirements/requirements.txt index b3e71681..1ba89718 100644 --- a/server/requirements/requirements.txt +++ b/server/requirements/requirements.txt @@ -7,15 +7,13 @@ anyascii==0.3.1 # via wagtail anyio==3.5.0 - # via watchgod + # via watchfiles argon2-cffi==21.3.0 # via -r requirements.in argon2-cffi-bindings==21.2.0 # via argon2-cffi asgiref==3.5.0 - # via - # django - # uvicorn + # via django async-timeout==4.0.2 # via redis attrs==21.4.0 @@ -44,15 +42,15 @@ cryptography==36.0.2 # via authlib deprecated==1.2.13 # via redis -dj-database-url==0.5.0 +dj-database-url==1.0.0 # via -r requirements.in django==3.2.13 # via # -r requirements.in + # dj-database-url # django-cors-headers # django-csp # django-filter - # django-htmx # django-model-utils # django-modelcluster # django-permissionedforms @@ -204,7 +202,7 @@ urllib3==1.26.9 # via # requests # sentry-sdk -uvicorn[standard]==0.17.6 +uvicorn[standard]==0.18.3 # via -r requirements.in uvloop==0.16.0 # via uvicorn @@ -217,7 +215,7 @@ wagtail-factories==2.0.1 # via -r requirements.in wagtail-localize==1.2.1 # via -r requirements.in -watchgod==0.8.1 +watchfiles==0.17.0 # via uvicorn webencodings==0.5.1 # via html5lib