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

fix(ci): add workaround for importlib-resources name discrepancies [backport 2.8] #10033

Merged
merged 2 commits into from
Aug 2, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Aug 1, 2024

Backport d4b8e9d from #9871 to 2.8.

Currently we have some internal test failures like this on importlib-resources due to naming discrepancies. Seems like they started happening on main after #9866 was merged into main. This should fix these failures.

Checklist

  • PR author has checked that all the criteria below are met
  • The PR description includes an overview of the change
  • The PR description articulates the motivation for the change
  • The change includes tests OR the PR description describes a testing strategy
  • The PR description notes risks associated with the change, if any
  • Newly-added code is easy to change
  • The change follows the library release note guidelines
  • The change includes or references documentation updates if necessary
  • Backport labels are set (if applicable)

Reviewer Checklist

  • Reviewer has checked that all the criteria below are met
  • Title is accurate
  • All changes are related to the pull request's stated goal
  • Avoids breaking API changes
  • Testing strategy adequately addresses listed risks
  • Newly-added code is easy to change
  • Release note makes sense to a user of the library
  • If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment
  • Backport labels are set in a manner that is consistent with the release branch maintenance policy

…9871)

Currently we have some `internal` test failures like
[this](https://app.circleci.com/pipelines/github/DataDog/dd-trace-py/66174/workflows/c90a65a7-ba6a-4fa2-b834-73c5bfe51d80/jobs/4070901)
on `importlib-resources` due to naming discrepancies. Seems like they
started happening on main after
#9866 was merged into main.
This should fix these failures.

## Checklist
- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist
- [x] Reviewer has checked that all the criteria below are met
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

(cherry picked from commit d4b8e9d)
@github-actions github-actions bot requested a review from a team as a code owner August 1, 2024 16:08
@github-actions github-actions bot added the changelog/no-changelog A changelog entry is not required for this PR. label Aug 1, 2024
@datadog-dd-trace-py-rkomorn
Copy link

Datadog Report

Branch report: backport-9871-to-2.8
Commit report: 437242d
Test service: dd-trace-py

✅ 0 Failed, 1574 Passed, 292 Skipped, 4m 38.87s Total duration (20.61s time saved)

@pr-commenter
Copy link

pr-commenter bot commented Aug 1, 2024

Benchmarks

Benchmark execution time: 2024-08-01 17:12:21

Comparing candidate commit 437242d in PR branch backport-9871-to-2.8 with baseline commit 9f88da4 in branch 2.8.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 177 metrics, 9 unstable metrics.

@mabdinur mabdinur closed this Aug 1, 2024
@mabdinur mabdinur reopened this Aug 1, 2024
@romainkomorndatadog
Copy link
Collaborator

Manually merging this since it's a backport and it's blocking other things.

@romainkomorndatadog romainkomorndatadog merged commit 93416f2 into 2.8 Aug 2, 2024
56 of 59 checks passed
@romainkomorndatadog romainkomorndatadog deleted the backport-9871-to-2.8 branch August 2, 2024 07:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/no-changelog A changelog entry is not required for this PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants