diff --git a/DEBUGGING.md b/DEBUGGING.md deleted file mode 100644 index a117915..0000000 --- a/DEBUGGING.md +++ /dev/null @@ -1,38 +0,0 @@ - -[Virtualenv installs envs into local/bin instead of bin] -https://askubuntu.com/questions/1406304/virtualenv-installs-envs-into-local-bin-instead-of-bin - -[BUG] setuptools>=60.0.0 causes virtualenv to create abnormal tree structure on ubuntu 22.04 #3278 -https://github.com/pypa/setuptools/issues/3278 -PR is old, mentions tested with 60, 61, 62 - -Ubuntu 22.02 packages and dependencies: - python3-pip - Depends: ca-certificates - Depends: python3-distutils - Depends: python3-setuptools - Depends: python3-wheel - Depends: - python3:i386 - python3 - Breaks: python-pip - Recommends: build-essential - Recommends: python3-dev - Replaces: python-pip - -distutils, setuptools versions (`deb`=system python3-setuptools package) -find with e.g. `find .build/bootstrap/pactivate/ -name \*setuptools\*` - - 3.10.4 59.6.0-1.2 yasu 22.04 deb package version - 65.3.0 container 22.04 virtualenv - - yasu 22.04 deb: not installed - - container 22.04 deb: not installed - 65.3.0 container bootstrap (probably) - -pass/fail systems: - - ok Docker container (record config here!) - ok Yasu WSL2 22.04; has distutils installed - BAD Yasu ??? 22.04; no distutils - -distutils versions: diff --git a/cont-test b/cont-test index 4993d59..570dc54 100755 --- a/cont-test +++ b/cont-test @@ -68,17 +68,6 @@ echo '━━━━━ run pactivate clean' [[ -d $bsve/virtualenv/ ]] || fail "not a dir: $bsve/virtualenv/" $virtualenv/bin/pip --version || fail "pip --version didn't work" -# temp stop and look -echo -ls -CF .build/virtualenv/ -fail "XXX Tests temporarily stop here" - -echo '━━━━━ XXX debugging test' -rm -rf .build -ln -s $(/usr/local/pythonz/bin/pythonz locate 3.10.7) .python -(. $pactivate) -$virtualenv/bin/pip --version || fail "pip --version didn't work" - echo '━━━━━ run pactivate installed' # This should do nothing but run the existing virtualenv's activate # It also tests the -q option so we can leave it out (by default) diff --git a/pactivate b/pactivate index dfaa111..9e2abc0 100644 --- a/pactivate +++ b/pactivate @@ -64,6 +64,8 @@ mkdir -p "$__pa_bootdir" # also ensures that $__pa_builddir exists echo '----- Installing bootstrap virtualenv' PYTHONPATH="$__pa_bootdir" "$__pa_bootdir/bin/pip" \ $__pa_quiet install -t "$__pa_bootdir" virtualenv + # If you want to use "current" virtualenv instead, install: + # git+https://github.com/pypa/virtualenv@main } [[ -d $__pa_builddir/virtualenv/ ]] || { @@ -83,6 +85,7 @@ mkdir -p "$__pa_bootdir" # also ensures that $__pa_builddir exists echo fi echo -n "Version: " && "$__pa_python" --version + DEB_PYTHON_INSTALL_LAYOUT='deb' \ PYTHONPATH="$__pa_bootdir" "$__pa_python_deref" -s -m virtualenv \ $__pa_quiet --prompt $(dirname "$__pa_basedir") \ "$__pa_builddir/virtualenv/" \