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 markupsafe #3609

Merged
merged 6 commits into from
Jan 31, 2024
Merged

Conversation

iurisilvio
Copy link
Contributor

@iurisilvio iurisilvio commented Jan 1, 2024

Description

Fixes #2476

I bumped versions of some dependencies.

  • Old Jinja2 doesn't work with new markupsafe, so I upgraded Jinja2.
  • Old Flask doesn't work with new Jinja2, so I upgraded Flask.
  • Flask requires minimal versions of click, itsdangerous and werkzeug, so I upgraded them.

Upgrades unrelated to markupsafe to make examples work:

  • protobuf was pinned to a conflicted version because of some transitive dependency changed:
The conflict is caused by:
    The user requested protobuf==3.18.3
    googleapis-common-protos 1.52.0 depends on protobuf>=3.6.0
    opentelemetry-proto 1.20.0 depends on protobuf<5.0 and >=3.19

We could at least have a CI action to install these example requirements file to check if they're not outdated.

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

The dependencies are used only for build and tests.

  • Test A

Does This PR Require a Contrib Repo Change?

Answer the following question based on these examples of changes that would require a Contrib Repo Change:

  • The OTel specification has changed which prompted this PR to update the method interfaces of opentelemetry-api/ or opentelemetry-sdk/

  • The method interfaces of test/util have changed

  • Scripts in scripts/ that were copied over to the Contrib repo have changed

  • Configuration files that were copied over to the Contrib repo have changed (when consistency between repositories is applicable) such as in

    • pyproject.toml
    • isort.cfg
    • .flake8
  • When a new .github/CODEOWNER is added

  • Major changes to project information, such as in:

    • README.md
    • CONTRIBUTING.md
  • Yes. - Link to PR:

  • No.

Checklist:

  • Followed the style guidelines of this project
  • Changelogs have been updated
  • Unit tests have been added
  • Documentation has been updated

@iurisilvio iurisilvio requested a review from a team January 1, 2024 11:19
@iurisilvio iurisilvio marked this pull request as draft January 1, 2024 11:33
@iurisilvio iurisilvio force-pushed the upgrade-markupsafe branch 2 times, most recently from d4fbc61 to d6e1291 Compare January 1, 2024 11:56
@iurisilvio iurisilvio marked this pull request as ready for review January 1, 2024 12:47
@iurisilvio
Copy link
Contributor Author

The CI failure is related to #3611.

tox.ini Outdated Show resolved Hide resolved
@ocelotl ocelotl enabled auto-merge (squash) January 31, 2024 03:47
auto-merge was automatically disabled January 31, 2024 03:53

Pull Request is not mergeable

@ocelotl ocelotl merged commit 763cd6b into open-telemetry:main Jan 31, 2024
312 checks passed
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.

Investigate and properly fix the markupsafe import error
4 participants