diff --git a/.github/workflows/pullpreview.yml b/.github/workflows/pullpreview.yml index cde0f8c..988b861 100644 --- a/.github/workflows/pullpreview.yml +++ b/.github/workflows/pullpreview.yml @@ -9,26 +9,19 @@ jobs: with: environment: ${{ inputs.environment }} - docker-build: - runs-on: ubuntu-latest + paketo_build: needs: [ setup ] - steps: - - name: Checkout repo - uses: actions/checkout@v4 - - - name: Build and push docker image - uses: docker/build-push-action@v4 - with: - context: . - tags: ${{ steps.metadata.outputs.tags}} - labels: ${{ steps.metadata.outputs.labels }} - push: true - file: ./Dockerfile.pullpreview - build-args: | - LAST_COMMIT='${{ github.sha }}' + permissions: + packages: write + uses: communitiesuk/funding-service-design-workflows/.github/workflows/package.yml@main + with: + version_to_build: sha-${{ github.sha }} + owner: ${{ github.repository_owner }} + application: funding-service-design-fund-application-builder + assets_required: false deploy: - needs: [ setup, docker-build ] + needs: [ setup, paketo_build ] permissions: contents: read # to fetch code (actions/checkout) deployments: write # to delete deployments diff --git a/requirements.txt b/requirements.txt index ac2cdd2..9cc544e 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.in +# pip-compile requirements-dev.in # airium==0.2.6 # via -r requirements.in @@ -15,7 +15,11 @@ attrs==24.2.0 babel==2.15.0 # via flask-babel beautifulsoup4==4.12.3 - # via funding-service-design-utils + # via + # -r requirements-dev.in + # funding-service-design-utils +black==24.8.0 + # via -r requirements-dev.in blinker==1.8.2 # via # flask @@ -36,18 +40,45 @@ 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 flask + # via + # black + # djlint + # flask +colorama==0.4.6 + # via djlint 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 @@ -93,8 +124,18 @@ 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 @@ -104,12 +145,19 @@ 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 @@ -127,26 +175,50 @@ 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 mypy + # via + # black + # mypy +nodeenv==1.9.1 + # via pre-commit 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 @@ -155,6 +227,21 @@ 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 @@ -162,7 +249,9 @@ python-dateutil==2.9.0.post0 # botocore # pandas python-dotenv==1.0.1 - # via funding-service-design-utils + # via + # -r requirements-dev.in + # funding-service-design-utils python-json-logger==2.0.7 # via funding-service-design-utils pytz==2024.1 @@ -171,7 +260,10 @@ pytz==2024.1 # funding-service-design-utils # pandas pyyaml==6.0.1 - # via funding-service-design-utils + # via + # djlint + # funding-service-design-utils + # pre-commit redis==4.6.0 # via # flask-redis @@ -180,6 +272,8 @@ referencing==0.35.1 # via # jsonschema # jsonschema-specifications +regex==2023.12.25 + # via djlint requests==2.32.3 # via # -r requirements.in @@ -197,6 +291,8 @@ sentry-sdk[flask]==2.10.0 # via funding-service-design-utils six==1.16.0 # via + # cssbeautifier + # jsbeautifier # pyscss # python-consul # python-dateutil @@ -220,6 +316,8 @@ 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 @@ -232,6 +330,8 @@ 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