-
Notifications
You must be signed in to change notification settings - Fork 153
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.
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
Bump djlint from 1.19.16 to 1.31.1 #10804
Conversation
7c2cb6f
to
22df3ec
Compare
c63b5ff
to
417d0c7
Compare
Bumps [djlint](https://github.com/Riverside-Healthcare/djlint) from 1.19.16 to 1.31.1. - [Release notes](https://github.com/Riverside-Healthcare/djlint/releases) - [Changelog](https://github.com/Riverside-Healthcare/djLint/blob/master/.releaserc) - [Commits](djlint/djLint@v1.19.16...v1.31.1) --- updated-dependencies: - dependency-name: djlint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
417d0c7
to
d6ba8f1
Compare
A newer version of djlint exists, but since this PR has been edited by someone other than Dependabot I haven't updated it. You'll get a PR for the updated version as normal once this PR is merged. |
djlint . --check | ||
# Disable djhtml formatting until it's updated to work with djlint | ||
# djhtml -c maintenance/ network-api/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Re-enabled djlint
and disabled djhtml
.
blank_line_after_tag="load,extends,include,endblock" | ||
blank_line_before_tag="load,extends,include,block" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated djlint
settings to have better block formatting.
tasks.py
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Re-enabled djlint
and disabled djhtml
.
Hi @mmmavis, can you take a look at the changes I've introduced here, please? I've marked the significant ones with comments. The other are just formatting. They boil down to Also, there are some merge conflicts in the form assembly and petitions templates, which I'm not familiar enough to be comfortable making changes. Could you take a look at those, please? |
…o prevent having to manually fix merge conflicts.
Hey @mmmavis , is this still something that we would like to review and merge or should we close? |
@mofodevops This PR is pretty outdated. I'm gonna close it. |
OK, I won't notify you again about this release, but will get in touch when a new version is available. If you'd rather skip all updates until the next major or minor version, let me know by commenting If you change your mind, just re-open this PR and I'll resolve any conflicts on it. |
Bumps djlint from 1.19.16 to 1.31.1.
Release notes
Sourced from [djlint's releases](https://github.com/Riverside-Healthcare/djlint/releases).
... (truncated)
Commits
7366ed5
chore(release): 1.31.1 [skip ci]dc484b9
Merge pull request [consolidate env #701](https://redirect.github.com/chore(deps) Update all non-major dependencies djlint/djLint#701) from Riverside-Healthcare/dev8739f4e
Merge branch 'master' into devf2a9511
chore(regex): cleaned up some regex for matching ignored blocks75c3134
fix(formatter): fixed overgrabbing on template tag condensing5c75d87
fix(formatter): fixed formatter formatting ignored codea197200
fix(formatter): function index was not formatted correctly6d63a6a
fix(formatter): fixed function formatting with nested quoted parenthesisbc15080
chore(deps) Update dependency mypy to v1.4.15b6d680
chore(deps) Update all non-major dependenciesYou can trigger a rebase of this PR by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebase
will rebase this PR@dependabot recreate
will recreate this PR, overwriting any edits that have been made to it@dependabot merge
will merge this PR after your CI passes on it@dependabot squash and merge
will squash and merge this PR after your CI passes on it@dependabot cancel merge
will cancel a previously requested merge and block automerging@dependabot reopen
will reopen this PR if it is closed@dependabot close
will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot ignore this major version
will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor version
will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependency
will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)┆Issue is synchronized with this Jira Task