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

Upgrade Jinja support to work with Django 5 #1

Merged
merged 10 commits into from
Feb 26, 2024
Merged

Conversation

CuriousLearner
Copy link
Collaborator

No description provided.

cclauss and others added 7 commits January 9, 2024 12:24
* fix: make it work for django5.0

* Update CHANGELOG

---------

Co-authored-by: peko <yoyo.mepa@gmail.com>
* GitHub Actions: Add Python 3.12 to the testing
As discussed at torchbox#236 (review)
* tox.ini: Add py312
* Stop testing Django v4.1
…rary into jinja

* 'main' of https://github.com/torchbox/django-pattern-library:
  Add Python 3.12 to the test matrix, drop Django 4.1 (torchbox#242)
  Updates for version 1.2.0
  Improve handling of non-string values for 'override_tag's 'default_html' argument (torchbox#224)
  fix: make it work for django5.0 (updated) (torchbox#241)
  Upgrade GitHub Actions versions (torchbox#237)
  Fix typos discovered by codespell (torchbox#238)
Copy link
Collaborator

@maribedran maribedran left a comment

Choose a reason for hiding this comment

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

@CuriousLearner everything looks good. Can you update the poetry lock file to fix the CI?

@mtrythall
Copy link
Member

Once CI is fixed let's merge this please.

@maribedran
Copy link
Collaborator

@CuriousLearner I don't think the build site CI action concerns us, right? Everything looks good to me.

@CuriousLearner
Copy link
Collaborator Author

I think so, but wasn't sure if it was working before 😅 So, we're good to merge then @mtrythall

@mtrythall mtrythall merged commit 13e6632 into jinja Feb 26, 2024
7 of 8 checks passed
@mtrythall mtrythall deleted the upgrade-jinja-django-5 branch February 26, 2024 21:08
@maribedran
Copy link
Collaborator

@CuriousLearner our branch was based on this outdated PR: torchbox#206
Can you open a new PR on the original repo with this work?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants