Skip to content

Commit

Permalink
NRL-817 DO NOT USE: Fast dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
axelkrastek1-nhs committed Jul 2, 2024
1 parent 68ea11f commit 91cf688
Show file tree
Hide file tree
Showing 10 changed files with 537 additions and 821 deletions.
22 changes: 10 additions & 12 deletions .github/workflows/pr-env-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,16 @@ jobs:
- name: Setup asdf cache
uses: actions/cache@v4
with:
path: ~/.asdf
key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
restore-keys: |
${{ runner.os }}-asdf-
path: |
~/.asdf/plugins
~/.asdf/installs
key: ${{ runner.os }}-asdfquick2-${{ hashFiles('**/.tool-versions') }}

- name: Install asdf
uses: asdf-vm/actions/[email protected]
- name: Setup asdf
uses: asdf-vm/actions/[email protected]

- name: Install asdf tools
run: make asdf-install

- name: Install zip
run: sudo apt-get install zip
Expand Down Expand Up @@ -132,8 +135,6 @@ jobs:
with:
path: ~/.asdf
key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
restore-keys: |
${{ runner.os }}-asdf-

- name: Install asdf
uses: asdf-vm/actions/[email protected]
Expand Down Expand Up @@ -215,8 +216,6 @@ jobs:
with:
path: ~/.asdf
key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
restore-keys: |
${{ runner.os }}-asdf-

- name: Install asdf and tools
uses: asdf-vm/actions/[email protected]
Expand Down Expand Up @@ -246,6 +245,7 @@ jobs:
run: make test-features-integration TF_WORKSPACE_NAME=${{ needs.set-environment-id.outputs.environment_id }}

performance-test:
if: false
name: Run Performance Tests
needs: [set-environment-id, integration-test]
environment: pull-request
Expand All @@ -262,8 +262,6 @@ jobs:
with:
path: ~/.asdf
key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
restore-keys: |
${{ runner.os }}-asdf-

- name: Install asdf and tools
uses: asdf-vm/actions/[email protected]
Expand Down
7 changes: 0 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,3 @@ repos:
# language: pygrep
# types: [python]
# exclude: layer/nrlf/nrlf/core/validators.py|layer/psycopg2/.*|mi/.*

- repo: local
hooks:
- id: create_changelog
name: Create changelog from changelog files
entry: changelog/scripts/changelog-pre-commit.sh
language: python
5 changes: 0 additions & 5 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
awscli 2.15.11
poetry 1.8.2
jq 1.7.1
python 3.12.2
terraform 1.3.4
java zulu-jre-17.42.19
yq 4.35.2
allure 2.27.0
k6 0.50.0
6 changes: 3 additions & 3 deletions behave.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[behave]
#[behave]
# Add the Allure formatter and output directory
format = allure_behave.formatter:AllureFormatter
outfiles = allure-results
# format = allure_behave.formatter:AllureFormatter
# outfiles = allure-results
1,305 changes: 522 additions & 783 deletions poetry.lock

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ pyjwt = "^2.8.0"

[tool.poetry.group.dev.dependencies]
layers = {path = "layer", develop = true}
nrlf-converter = {url = "https://github.com/NHSDigital/nrlf-converter/releases/download/0.0.9/nrlf_converter-0.0.9-py3-none-any.whl"}
pytest = "^8.1.1"
pytest-mock = "^3.12.0"
pytest-cov = "^5.0.0"
Expand All @@ -26,13 +25,10 @@ sh = "^2.0.6"
moto = {extras = ["dynamodb", "s3"], version = "^5.0.5"}
behave = "^1.2.6"
pyyaml = "^6.0.1"
datamodel-code-generator = "^0.25.4"
pre-commit = "^3.6.2"
ruff = "^0.3.2"
fire = "^0.6.0"
gherkin-official = "^28.0.0"
allure-pytest = "^2.13.5"
allure-behave = "^2.13.3"
freezegun = "^1.4.0"
pytest-env = "^1.1.3"
matplotlib = "^3.8.4"
Expand Down
3 changes: 0 additions & 3 deletions scripts/check-build-environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,12 @@ echo
echo "Checking build environment...."

BUILD_DEPENDENCIES="
allure
behave
pre-commit
jq
poetry
pytest
python
terraform
yq
zip
"

Expand Down
1 change: 0 additions & 1 deletion scripts/check-deploy-environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ echo "Checking deployment environment...."

DEPLOY_DEPENDENCIES="
aws
jq
terraform
"
for dep in ${DEPLOY_DEPENDENCIES}; do
Expand Down
3 changes: 1 addition & 2 deletions tests/features/environment.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import os

from behave.runner import Context

from tests.features.utils.certificates import get_cert_path_for_environment
from utils.certificates import get_cert_path_for_environment

os.environ.setdefault("POWERTOOLS_LOG_LEVEL", "ERROR")
os.environ.setdefault("AWS_DEFAULT_REGION", "eu-west-2")
Expand Down
2 changes: 1 addition & 1 deletion tests/features/steps/1_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
from behave import * # noqa
from behave.runner import Context
from pydantic import BaseModel
from utils.data import create_test_document_reference

from nrlf.core.dynamodb.model import DocumentPointer
from tests.features.utils.data import create_test_document_reference


class Application(BaseModel):
Expand Down

0 comments on commit 91cf688

Please sign in to comment.