Skip to content

Commit

Permalink
fix(ci): add workaround for importlib-resources name discrepancies (#…
Browse files Browse the repository at this point in the history
…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)
  • Loading branch information
erikayasuda authored and github-actions[bot] committed Jul 19, 2024
1 parent bbbc041 commit a4f40ee
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions tests/internal/test_packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ def test_get_distributions():
importlib_pkgs.add("importlib-metadata")
elif pkg.name == "importlib-metadata" and "importlib_metadata" in pkg_resources_ws:
importlib_pkgs.add("importlib_metadata")
elif pkg.name == "importlib-resources" and "importlib_resources" in pkg_resources_ws:
importlib_pkgs.add("importlib_resources")
elif pkg.name == "importlib_resources" and "importlib-resources" in pkg_resources_ws:
importlib_pkgs.add("importlib-resources")
else:
importlib_pkgs.add(pkg.name)

Expand Down

0 comments on commit a4f40ee

Please sign in to comment.