From e7fe08c7c0f5781adb5f3fdaef4b9d1d8737ee83 Mon Sep 17 00:00:00 2001 From: Nuwan Samarasinghe Date: Mon, 16 Sep 2024 14:29:01 +0100 Subject: [PATCH] application startup fixes --- Procfile | 2 +- devtest.py | 3 ++ local.py | 3 ++ requirements.in | 31 ------------- requirements.txt | 112 +++-------------------------------------------- 5 files changed, 13 insertions(+), 138 deletions(-) create mode 100644 devtest.py create mode 100644 local.py diff --git a/Procfile b/Procfile index 0528d8a0..a3c2eeab 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: gunicorn wsgi:app -c run/gunicorn/devtest.py +web: gunicorn wsgi:app -c devtest.py diff --git a/devtest.py b/devtest.py new file mode 100644 index 00000000..844e163c --- /dev/null +++ b/devtest.py @@ -0,0 +1,3 @@ +from fsd_utils.gunicorn.config.devtest import * # noqa + +# bind = "127.0.0.1:5000" diff --git a/local.py b/local.py new file mode 100644 index 00000000..714879d5 --- /dev/null +++ b/local.py @@ -0,0 +1,3 @@ +from fsd_utils.gunicorn.config.local import * # noqa + +# bind = "127.0.0.1:5000" diff --git a/requirements.in b/requirements.in index 2c3d0a12..1e4317ad 100644 --- a/requirements.in +++ b/requirements.in @@ -61,34 +61,3 @@ funding-service-design-utils>=4.0.1 jsonschema openpyxl pandas - - -#----------------------------------- -# Pytest -#----------------------------------- - -pytest==8.3.2 -pytest-mock==3.14.0 -pytest-html>=3.2.0 -pytest-env==1.1.3 - -#----------------------------------- -# Dev Utils -#----------------------------------- -invoke==2.2.0 -pre-commit==3.8.0 -debugpy -python-dotenv - -#----------------------------------- -# Code Quality -#----------------------------------- -flake8==7.1.1 -flake8-pyproject==1.2.3 -black==24.8.0 -djlint - -#----------------------------------- -# Other Dev Dependencies -#----------------------------------- -beautifulsoup4==4.12.3 diff --git a/requirements.txt b/requirements.txt index 9cc544e8..ac2cdd26 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile requirements-dev.in +# pip-compile requirements.in # airium==0.2.6 # via -r requirements.in @@ -15,11 +15,7 @@ attrs==24.2.0 babel==2.15.0 # via flask-babel beautifulsoup4==4.12.3 - # via - # -r requirements-dev.in - # funding-service-design-utils -black==24.8.0 - # via -r requirements-dev.in + # via funding-service-design-utils blinker==1.8.2 # via # flask @@ -40,45 +36,18 @@ certifi==2024.7.4 # sentry-sdk cffi==1.16.0 # via cryptography -cfgv==3.4.0 - # via pre-commit charset-normalizer==3.3.2 # via requests click==8.1.7 - # via - # black - # djlint - # flask -colorama==0.4.6 - # via djlint + # via flask commonmark==0.9.1 # via rich cryptography==43.0.1 # via pyjwt -cssbeautifier==1.15.1 - # via djlint cssmin==0.2.0 # via -r requirements.in -debugpy==1.8.2 - # via -r requirements-dev.in -distlib==0.3.8 - # via virtualenv -djlint==1.34.1 - # via -r requirements-dev.in -editorconfig==0.12.4 - # via - # cssbeautifier - # jsbeautifier et-xmlfile==1.1.0 # via openpyxl -filelock==3.15.4 - # via virtualenv -flake8==7.1.1 - # via - # -r requirements-dev.in - # flake8-pyproject -flake8-pyproject==1.2.3 - # via -r requirements-dev.in flask==3.0.3 # via # -r requirements.in @@ -124,18 +93,8 @@ greenlet==3.0.3 # via sqlalchemy gunicorn==22.0.0 # via funding-service-design-utils -html-tag-names==0.1.2 - # via djlint -html-void-elements==0.1.0 - # via djlint -identify==2.5.36 - # via pre-commit idna==3.7 # via requests -iniconfig==2.0.0 - # via pytest -invoke==2.2.0 - # via -r requirements-dev.in itsdangerous==2.2.0 # via # flask @@ -145,19 +104,12 @@ jinja2==3.1.4 # flask # flask-babel # govuk-frontend-jinja - # pytest-html jmespath==1.0.1 # via # boto3 # botocore -jsbeautifier==1.15.1 - # via - # cssbeautifier - # djlint jsmin==3.0.1 # via -r requirements.in -json5==0.9.25 - # via djlint jsonschema==4.23.0 # via -r requirements.in jsonschema-specifications==2023.12.1 @@ -175,50 +127,26 @@ marshmallow==3.21.3 # via marshmallow-sqlalchemy marshmallow-sqlalchemy==1.0.0 # via -r requirements.in -mccabe==0.7.0 - # via flake8 mypy==1.10.1 # via sqlalchemy mypy-extensions==1.0.0 - # via - # black - # mypy -nodeenv==1.9.1 - # via pre-commit + # via mypy numpy==2.0.1 # via pandas openpyxl==3.1.5 # via -r requirements.in packaging==24.1 # via - # black # gunicorn # marshmallow - # pytest pandas==2.2.2 # via -r requirements.in -pathspec==0.12.1 - # via - # black - # djlint -platformdirs==4.2.2 - # via - # black - # virtualenv -pluggy==1.5.0 - # via pytest -pre-commit==3.8.0 - # via -r requirements-dev.in psycopg2-binary==2.9.9 # via -r requirements.in -pycodestyle==2.12.1 - # via flake8 pycparser==2.22 # via cffi pyee==6.0.0 # via flipper-client -pyflakes==3.2.0 - # via flake8 pygments==2.18.0 # via rich pyjwt[crypto]==2.8.0 @@ -227,21 +155,6 @@ pyjwt[crypto]==2.8.0 # pyjwt pyscss==1.4.0 # via -r requirements.in -pytest==8.3.2 - # via - # -r requirements-dev.in - # pytest-env - # pytest-html - # pytest-metadata - # pytest-mock -pytest-env==1.1.3 - # via -r requirements-dev.in -pytest-html==4.1.1 - # via -r requirements-dev.in -pytest-metadata==3.1.1 - # via pytest-html -pytest-mock==3.14.0 - # via -r requirements-dev.in python-consul==1.1.0 # via flipper-client python-dateutil==2.9.0.post0 @@ -249,9 +162,7 @@ python-dateutil==2.9.0.post0 # botocore # pandas python-dotenv==1.0.1 - # via - # -r requirements-dev.in - # funding-service-design-utils + # via funding-service-design-utils python-json-logger==2.0.7 # via funding-service-design-utils pytz==2024.1 @@ -260,10 +171,7 @@ pytz==2024.1 # funding-service-design-utils # pandas pyyaml==6.0.1 - # via - # djlint - # funding-service-design-utils - # pre-commit + # via funding-service-design-utils redis==4.6.0 # via # flask-redis @@ -272,8 +180,6 @@ referencing==0.35.1 # via # jsonschema # jsonschema-specifications -regex==2023.12.25 - # via djlint requests==2.32.3 # via # -r requirements.in @@ -291,8 +197,6 @@ sentry-sdk[flask]==2.10.0 # via funding-service-design-utils six==1.16.0 # via - # cssbeautifier - # jsbeautifier # pyscss # python-consul # python-dateutil @@ -316,8 +220,6 @@ sqlalchemy-utils==0.41.2 # funding-service-design-utils thrift==0.20.0 # via flipper-client -tqdm==4.66.4 - # via djlint typing-extensions==4.12.2 # via # alembic @@ -330,8 +232,6 @@ urllib3==2.2.2 # botocore # requests # sentry-sdk -virtualenv==20.26.3 - # via pre-commit webassets==2.0 # via flask-assets werkzeug==3.0.3