Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[stable-2.10] Guard against allowing ansible to ansible-base upgrades (…
…#70529) (#70760) * Fix building Ansible dist w/ setuptools>=48,<49.1 (#70525) * Fix building Ansible dist w/ setuptools>=48,<49.1 This change addresses the deprecation of the use of stdlib `distutils`. It's a short-term hotfix for the problem and we'll need to consider dropping the use of `distutils` from our `setup.py`. Refs: * #70456 * pypa/setuptools#2230 * pypa/setuptools@bd110264 Co-Authored-By: Jason R. Coombs <jaraco@jaraco.com> * Add a change note for PR #70525 Co-authored-by: Jason R. Coombs <jaraco@jaraco.com> (cherry picked from commit 918388b) * Guard against allowing ansible to ansible-base upgrades (#70529) * Guard against allowing ansible to ansible-base upgrades * newline * use alias * Add an explicit line detailing this is a 1 time thing * period * Read __version__ and __author__ rather than import, update working, and add ability to skip conflict checks * Remove commented code * Re introduce removed changes from rebase * Just use open * Nuke unused import (cherry picked from commit 54b002e) Co-authored-by: Sviatoslav Sydorenko <webknjaz@redhat.com>
- Loading branch information
Showing
2 changed files
with
93 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
bugfixes: | ||
- > | ||
Address the deprecation of the use of stdlib | ||
distutils in packaging. It's a short-term hotfix for the problem | ||
(https://github.com/ansible/ansible/issues/70456, | ||
https://github.com/pypa/setuptools/issues/2230, | ||
https://github.com/pypa/setuptools/commit/bd110264) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters