Skip to content

Commit

Permalink
Merge branch 'mh/implement-mvp-search-form-2369' into jp/search-audit…
Browse files Browse the repository at this point in the history
…-year
  • Loading branch information
jperson1 committed Oct 18, 2023
2 parents 30b2743 + d7d1c27 commit 7c99f95
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -174,3 +174,5 @@ terraform/**/*.tfstate*
terraform/**/*.tfvars
terraform/shared/modules/egress-proxy/proxy.zip
terraform/shared/modules/egress-proxy/test/client.zip
very_cool_passing_xlsx
scratch.txt
8 changes: 6 additions & 2 deletions backend/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ lint:
@echo "Flake8:"
@flake8
@echo "black:"
@black --check .
@black --check --exclude '\.venv|node_modules' .
@echo "bandit:"
@bandit -c pyproject.toml -r .
@echo "Installing type stubs:"
Expand Down Expand Up @@ -83,7 +83,7 @@ docker-nctest:

docker-lint:
docker compose build
docker compose run web bash -c 'flake8 && black --check . && bandit -c pyproject.toml -r . && python -m pip install types-pytz && mypy . && djlint .'
docker compose run web bash -c 'flake8 && black --check --exclude '\.venv|node_modules' . && bandit -c pyproject.toml -r . && mypy . && djlint .'

ghcr-first-run:
docker compose -f docker-compose-web.yml run web python manage.py makemigrations
Expand Down Expand Up @@ -119,3 +119,7 @@ docker-full-clean:
docker volume rm $(docker volume ls -q)
docker system prune -f
docker volume prune -f
dfs:
make docker-clean
make docker-first-run
docker compose up
1 change: 1 addition & 0 deletions backend/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ exclude_dirs = [
"node_modules",
"dissemination/test_search.py",
"dissemination/tests.py",
".venv"
]

[tool.djlint]
Expand Down
11 changes: 7 additions & 4 deletions lighthouserc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,20 @@ module.exports = {
ci: {
collect: {
url: [
'http://localhost:8000/',
'http://localhost:8000/report_submission/eligibility',
// 'http://localhost:8000/',
// 'http://localhost:8000/report_submission/eligibility',
'http://localhost:8000/report_submission/auditeeinfo',
'http://localhost:8000/report_submission/accessandsubmission',
'http://localhost:8000/audit',
// 'http://localhost:8000/report_submission/accessandsubmission',
// 'http://localhost:8000/audit',
],
},
assert: {
assertions: {
"categories:accessibility": ["error", {"minScore": .98}]
}
},
upload: {
target: 'temporary-public-storage',
}
},
};

0 comments on commit 7c99f95

Please sign in to comment.