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 pkgresources import #7866

Closed
wants to merge 7 commits into from
Closed

Fix pkgresources import #7866

wants to merge 7 commits into from

Conversation

sanderr
Copy link
Contributor

@sanderr sanderr commented Jul 18, 2024

Description

Fixed import of pkg_resources.extern, which was dropped in the latest setuptools release (v71).

Self Check:

Strike through any lines that are not applicable (~~line~~) then check the box

  • Attached issue to pull request
  • Changelog entry
  • Type annotations are present
  • Code is clear and sufficiently documented
  • No (preventable) type errors (check using make mypy or make mypy-diff)
  • Sufficient test cases (reproduces the bug/tests the requested feature)
  • Correct, in line with design
  • End user documentation is included or an issue is created for end-user documentation (add ref to issue here: )
  • If this PR fixes a race condition in the test suite, also push the fix to the relevant stable branche(s) (see test-fixes for more info)

@sanderr sanderr requested a review from arnaudsjs July 18, 2024 09:17
upgrade-note: "If you had previously constrained `setuptools<71` in your `pyproject.yml`, you may now drop the constraint"
destination-branches:
- master
- iso7
Copy link
Contributor Author

Choose a reason for hiding this comment

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

iso6 will have its own PR because it has a second occurrence of this import.

@sanderr
Copy link
Contributor Author

sanderr commented Jul 18, 2024

@edvgui requesting your review for the changelog entries (what's in "sections" will be visible to the customers in the generated changelog for the patch release in the documentation).

@sanderr sanderr requested a review from edvgui July 18, 2024 09:26
@sanderr
Copy link
Contributor Author

sanderr commented Jul 18, 2024

@arnaudsjs I had to apply one more fix due to pypa/setuptools#4482. It's not pretty but it's the best I can think of on short notice, and we can hopefully get rid of the hack when we migrate away from pkg_resources.

@sanderr sanderr added the merge-tool-ready This ticket is ready to be merged in label Jul 18, 2024
@inmantaci
Copy link
Contributor

Processing this pull request

inmantaci pushed a commit that referenced this pull request Jul 18, 2024
# Description

Fixed import of `pkg_resources.extern`, which was dropped in the latest `setuptools` release (v71).

# Self Check:

Strike through any lines that are not applicable (`~~line~~`) then check the box

- [x] ~~Attached issue to pull request~~
- [x] Changelog entry
- [x] ~~Type annotations are present~~
- [x] ~~Code is clear and sufficiently documented~~
- [x] No (preventable) type errors (check using make mypy or make mypy-diff)
- [x] ~~Sufficient test cases (reproduces the bug/tests the requested feature)~~
- [x] Correct, in line with design
- [x] End user documentation is included or an issue is created for end-user documentation (add ref to issue here: )
- [x] ~~If this PR fixes a race condition in the test suite, also push the fix to the relevant stable branche(s) (see [test-fixes](https://internal.inmanta.com/development/core/tasks/build-master.html#test-fixes) for more info)~~
@inmantaci
Copy link
Contributor

Merged into branches master in 2ce0148

inmantaci pushed a commit that referenced this pull request Jul 18, 2024
# Description

Fixed import of `pkg_resources.extern`, which was dropped in the latest `setuptools` release (v71).

# Self Check:

Strike through any lines that are not applicable (`~~line~~`) then check the box

- [x] ~~Attached issue to pull request~~
- [x] Changelog entry
- [x] ~~Type annotations are present~~
- [x] ~~Code is clear and sufficiently documented~~
- [x] No (preventable) type errors (check using make mypy or make mypy-diff)
- [x] ~~Sufficient test cases (reproduces the bug/tests the requested feature)~~
- [x] Correct, in line with design
- [x] End user documentation is included or an issue is created for end-user documentation (add ref to issue here: )
- [x] ~~If this PR fixes a race condition in the test suite, also push the fix to the relevant stable branche(s) (see [test-fixes](https://internal.inmanta.com/development/core/tasks/build-master.html#test-fixes) for more info)~~
@inmantaci inmantaci closed this Jul 18, 2024
@inmantaci inmantaci deleted the fix-pkgresources-import branch July 18, 2024 12:31
@sanderr sanderr mentioned this pull request Jul 18, 2024
9 tasks
@inmantaci
Copy link
Contributor

Processing #7868.

inmantaci pushed a commit that referenced this pull request Jul 18, 2024
Pull request opened by the merge tool on behalf of #7866
inmantaci pushed a commit that referenced this pull request Jul 18, 2024
# Description

Fixed import of `pkg_resources.extern`, which was dropped in the latest `setuptools` release (v71).

# Self Check:

Strike through any lines that are not applicable (`~~line~~`) then check the box

- [x] ~~Attached issue to pull request~~
- [x] Changelog entry
- [x] ~~Type annotations are present~~
- [x] ~~Code is clear and sufficiently documented~~
- [x] No (preventable) type errors (check using make mypy or make mypy-diff)
- [x] ~~Sufficient test cases (reproduces the bug/tests the requested feature)~~
- [x] Correct, in line with design
- [x] End user documentation is included or an issue is created for end-user documentation (add ref to issue here: )
- [x] ~~If this PR fixes a race condition in the test suite, also push the fix to the relevant stable branche(s) (see [test-fixes](https://internal.inmanta.com/development/core/tasks/build-master.html#test-fixes) for more info)~~
inmantaci pushed a commit that referenced this pull request Jul 18, 2024
# Description

Fixed import of `pkg_resources.extern`, which was dropped in the latest `setuptools` release (v71).

# Self Check:

Strike through any lines that are not applicable (`~~line~~`) then check the box

- [x] ~~Attached issue to pull request~~
- [x] Changelog entry
- [x] ~~Type annotations are present~~
- [x] ~~Code is clear and sufficiently documented~~
- [x] No (preventable) type errors (check using make mypy or make mypy-diff)
- [x] ~~Sufficient test cases (reproduces the bug/tests the requested feature)~~
- [x] Correct, in line with design
- [x] End user documentation is included or an issue is created for end-user documentation (add ref to issue here: )
- [x] ~~If this PR fixes a race condition in the test suite, also push the fix to the relevant stable branche(s) (see [test-fixes](https://internal.inmanta.com/development/core/tasks/build-master.html#test-fixes) for more info)~~
sanderr added a commit that referenced this pull request Jul 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge-tool-ready This ticket is ready to be merged in
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants