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

Sync 6.x with 6.22.1 #2045

Closed
wants to merge 16 commits into from
Closed

Sync 6.x with 6.22.1 #2045

wants to merge 16 commits into from

Conversation

xrmx
Copy link
Member

@xrmx xrmx commented May 17, 2024

No description provided.

xrmx and others added 16 commits May 17, 2024 15:49
…ic#2026)

Create a PR from a branch already rebased so that the commit list in the github UI is clean.
…... (elastic#2028)

... 3ffa7e1

Made with ❤️️ by updatecli

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
As for some reason latest 8.4.0 is not working.
…lastic#2034)

* build(deps): bump jinja2 from 3.0.3 to 3.1.4 in /tests/requirements

Bumps [jinja2](https://github.com/pallets/jinja) from 3.0.3 to 3.1.4.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](pallets/jinja@3.0.3...3.1.4)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update tests/requirements/reqs-jinja2-2.txt

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Unfortunately flask 1.0 does not work with jinja 3.1.x:

venv/lib/python3.10/site-packages/flask/__init__.py:19: in <module>
    from jinja2 import Markup, escape
E   ImportError: cannot import name 'Markup' from 'jinja2'
It's always available since 3.2 and tests are already assuming that.
@xrmx xrmx requested review from estolfo and basepi May 17, 2024 13:51
@xrmx xrmx closed this May 17, 2024
@xrmx
Copy link
Member Author

xrmx commented May 17, 2024

CI for release is broken, need another release

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

Successfully merging this pull request may close these issues.

4 participants