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.

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

Closed
wants to merge 13 commits into from
Closed

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jun 28, 2023

Bumps djlint from 1.19.16 to 1.31.1.

Release notes

Sourced from [djlint's releases](https://github.com/Riverside-Healthcare/djlint/releases).

v1.31.1

[1.31.1](https://github.com/Riverside-Healthcare/djLint/compare/v1.31.0...v1.31.1) (2023-06-26)

Bug Fixes

v1.31.0

[1.31.0](https://github.com/Riverside-Healthcare/djLint/compare/v1.30.2...v1.31.0) (2023-06-12)

Bug Fixes

Features

v1.30.2

[1.30.2](https://github.com/Riverside-Healthcare/djLint/compare/v1.30.1...v1.30.2) (2023-06-02)

Bug Fixes

v1.30.1

[1.30.1](https://github.com/Riverside-Healthcare/djLint/compare/v1.30.0...v1.30.1) (2023-06-02)

Bug Fixes

v1.30.0

[1.30.0](https://github.com/Riverside-Healthcare/djLint/compare/v1.29.0...v1.30.0) (2023-05-30)

Bug Fixes

... (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/dev
  • 8739f4e Merge branch 'master' into dev
  • f2a9511 chore(regex): cleaned up some regex for matching ignored blocks
  • 75c3134 fix(formatter): fixed overgrabbing on template tag condensing
  • 5c75d87 fix(formatter): fixed formatter formatting ignored code
  • a197200 fix(formatter): function index was not formatted correctly
  • 6d63a6a fix(formatter): fixed function formatting with nested quoted parenthesis
  • bc15080 chore(deps) Update dependency mypy to v1.4.1
  • 5b6d680 chore(deps) Update all non-major dependencies
  • Additional commits viewable in [compare view](https://github.com/Riverside-Healthcare/djlint/compare/v1.19.16...v1.31.1)

Dependabot compatibility score

You 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)
> **Note** > Automatic rebases have been disabled on this pull request as it has been open for over 30 days.

┆Issue is synchronized with this Jira Task

@dependabot dependabot bot added backend dependencies Pull requests that update a dependency file engineering labels Jun 28, 2023
@dependabot dependabot bot requested a review from mmmavis June 28, 2023 21:44
@dependabot dependabot bot force-pushed the dependabot/pip/djlint-1.31.1 branch 4 times, most recently from 7c2cb6f to 22df3ec Compare July 7, 2023 03:18
@danielfmiranda danielfmiranda added the pip Used for dependabot PR's having to do with pip/python label Jul 7, 2023
@dependabot dependabot bot force-pushed the dependabot/pip/djlint-1.31.1 branch 10 times, most recently from c63b5ff to 417d0c7 Compare July 12, 2023 22:25
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>
@dependabot dependabot bot force-pushed the dependabot/pip/djlint-1.31.1 branch from 417d0c7 to d6ba8f1 Compare July 13, 2023 09:45
@jhonatan-lopes jhonatan-lopes mentioned this pull request Jul 14, 2023
@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Jul 24, 2023

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.

Comment on lines +100 to +102
djlint . --check
# Disable djhtml formatting until it's updated to work with djlint
# djhtml -c maintenance/ network-api/
Copy link
Contributor

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.

Comment on lines +10 to +11
blank_line_after_tag="load,extends,include,endblock"
blank_line_before_tag="load,extends,include,block"
Copy link
Contributor

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
Copy link
Contributor

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.

@jhonatan-lopes
Copy link
Contributor

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 djlint and djhtml not playing well together, so I've opted to re-enable djlint now that the blocking bug has been solved.

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?

@mofodevops
Copy link
Collaborator

Hey @mmmavis , is this still something that we would like to review and merge or should we close?

@mmmavis
Copy link
Collaborator

mmmavis commented Nov 20, 2024

@mofodevops This PR is pretty outdated. I'm gonna close it.

@mmmavis mmmavis closed this Nov 20, 2024
Copy link
Contributor Author

dependabot bot commented on behalf of github Nov 20, 2024

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 @dependabot ignore this major version or @dependabot ignore this minor version. You can also ignore all major, minor, or patch releases for a dependency by adding an ignore condition with the desired update_types to your config file.

If you change your mind, just re-open this PR and I'll resolve any conflicts on it.

@dependabot dependabot bot deleted the dependabot/pip/djlint-1.31.1 branch November 20, 2024 19:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backend dependencies Pull requests that update a dependency file engineering pip Used for dependabot PR's having to do with pip/python run visual regression tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants