Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RAS-837 Rops Security Alerts #875

Merged
merged 5 commits into from
Aug 2, 2023
Merged

RAS-837 Rops Security Alerts #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f9878fc
RAS-837 Rops Security Alerts
LJBabbage Jul 28, 2023
211c679
Update pipfile lock
LJBabbage Jul 31, 2023
8e540cf
Merge branch 'main' into update-packages-to-fix-dependabot-prs
LJBabbage Jul 31, 2023
339d427
Pin djlint
LJBabbage Jul 31, 2023
631c79b
auto patch increment
Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@ load-design-system-templates:
pipenv run ./scripts/load_templates.sh $(DESIGN_SYSTEM_VERSION)

lint:
pipenv check ./response_operations_ui ./tests -i 51499 -i 59062 -i 58755
pipenv check ./response_operations_ui ./tests
pipenv run isort .
pipenv run black --line-length 120 .
pipenv run djlint .
pipenv run flake8 --exclude ./node_modules

lint-check: load-design-system-templates
pipenv check ./response_operations_ui ./tests -i 51499 -i 59062 -i 58755
pipenv check ./response_operations_ui ./tests

pipenv run isort . --check-only
pipenv run black --line-length 120 --check .
pipenv run djlint .
Expand Down
2 changes: 1 addition & 1 deletion Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ email_validator = "*"
[dev-packages]
black = "*"
flake8 = "*"
djlint = "*"
djlint = "==1.25.0"
Copy link
Contributor Author

@LJBabbage LJBabbage Aug 1, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

djlint is causing issues when the lock file is regenerated, it concerns html linting. It's not related to this story and isn't one of the dependabot PRs, and should be fixed properly, so I will raise another card and pin it for the moment

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense

fakeredis = "*"
freezegun = "*"
isort = "*"
Expand Down
Loading