diff options
| author | Matt Clay <matt@mystile.com> | 2024-08-14 18:03:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-14 18:03:51 +0200 |
| commit | ab624ad0317205b76e3f3d6d65c2250b6ef6db06 (patch) | |
| tree | 88b6b4508c3d488909097468e85d28f9a18e0052 /hacking | |
| parent | fix copy module update atime/mtime (#83235) (diff) | |
| download | ansible-ab624ad0317205b76e3f3d6d65c2250b6ef6db06.tar.xz ansible-ab624ad0317205b76e3f3d6d65c2250b6ef6db06.zip | |
ansible-test - Remove generation of egg-info (#83786)
Also remove egg-info generation from hacking/env-setup scripts.
Diffstat (limited to 'hacking')
| -rw-r--r-- | hacking/env-setup | 18 | ||||
| -rw-r--r-- | hacking/env-setup.fish | 14 |
2 files changed, 0 insertions, 32 deletions
diff --git a/hacking/env-setup b/hacking/env-setup index 0a86e0fe4f..df1ea4020f 100644 --- a/hacking/env-setup +++ b/hacking/env-setup @@ -57,22 +57,6 @@ expr "$PYTHONPATH" : "${ANSIBLE_TEST_PREFIX_PYTHONPATH}.*" > /dev/null || prepen expr "$PATH" : "${PREFIX_PATH}.*" > /dev/null || prepend_path PATH "$PREFIX_PATH" expr "$MANPATH" : "${PREFIX_MANPATH}.*" > /dev/null || prepend_path MANPATH "$PREFIX_MANPATH" -# -# Generate egg_info so that pkg_resources works -# - -# Do the work in a function so we don't repeat ourselves later -gen_egg_info() -{ - # check for current and past egg-info directory names - if ls "$PREFIX_PYTHONPATH"/ansible*.egg-info >/dev/null 2>&1; then - # bypass shell aliases with leading backslash - # see https://github.com/ansible/ansible/pull/11967 - \rm -rf "$PREFIX_PYTHONPATH"/ansible*.egg-info - fi - "$PYTHON_BIN" setup.py egg_info -} - if [ "$ANSIBLE_DEV_HOME" != "$PWD" ] ; then current_dir="$PWD" else @@ -81,10 +65,8 @@ fi ( cd "$ANSIBLE_DEV_HOME" if [ "$verbosity" = silent ] ; then - gen_egg_info > /dev/null 2>&1 & find . -type f -name "*.pyc" -exec rm -f {} \; > /dev/null 2>&1 else - gen_egg_info find . -type f -name "*.pyc" -exec rm -f {} \; fi cd "$current_dir" diff --git a/hacking/env-setup.fish b/hacking/env-setup.fish index 529b57333e..ee945ec145 100644 --- a/hacking/env-setup.fish +++ b/hacking/env-setup.fish @@ -64,25 +64,11 @@ if not set -q PYTHON_BIN end end -# Generate egg_info so that pkg_resources works -function gen_egg_info - # Check if ansible*.egg-info directory exists and remove if found - if test -d $PREFIX_PYTHONPATH/ansible*.egg-info - rm -rf $PREFIX_PYTHONPATH/ansible*.egg-info - end - # Execute setup.py egg_info using the chosen Python interpreter - eval $PYTHON_BIN setup.py egg_info -end - pushd $ANSIBLE_HOME if test -n "$QUIET" - # Run gen_egg_info in the background and redirect output to /dev/null - gen_egg_info &> /dev/null # Remove any .pyc files found find . -type f -name "*.pyc" -exec rm -f '{}' ';' &> /dev/null else - # Run gen_egg_info - gen_egg_info # Remove any .pyc files found find . -type f -name "*.pyc" -exec rm -f '{}' ';' # Display setup details |