Revert "setup cleanup (#29419)" (#29451)

This reverts commit ad32816fd6.

.github/workflows/selfdrive_tests.yaml

@@ -149,17 +149,18 @@ jobs:
         PYTHONWARNINGS: default
     - name: Build openpilot
       run: |
-        eval "$(pyenv init --path)"
+        source tools/openpilot_env.sh
         poetry run scons -j$(nproc)
     - name: Run tests
       run: |
-        eval "$(pyenv init --path)"
+        source tools/openpilot_env.sh
+        export PYTHONPATH=$PWD
         poetry run tools/plotjuggler/test_plotjuggler.py
     - name: Pre Cache - Cleanup scons cache
       if: github.ref == 'refs/heads/master'
       run: |
+        source tools/openpilot_env.sh
         rm -rf /tmp/scons_cache/*
-        eval "$(pyenv init --path)"
         poetry run scons -j$(nproc) --cache-populate
     - name: Save scons cache
       id: scons-save-cache

tools/install_python_dependencies.sh

@@ -14,19 +14,21 @@ if ! command -v "pyenv" > /dev/null 2>&1; then
   echo "pyenv install ..."
   curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
 
+  echo -e "\n. ~/.pyenvrc" >> $RC_FILE
   cat <<EOF > "${HOME}/.pyenvrc"
 if [ -z "\$PYENV_ROOT" ]; then
   export PATH=\$HOME/.pyenv/bin:\$HOME/.pyenv/shims:\$PATH
   export PYENV_ROOT="\$HOME/.pyenv"
-  eval "\$(pyenv init --path)"
   eval "\$(pyenv init -)"
   eval "\$(pyenv virtualenv-init -)"
 fi
 EOF
-  echo -e "\nsource ~/.pyenvrc" >> $RC_FILE
 
-  # activate pyenv now
+  # setup now without restarting shell
-  source $RC_FILE
+  export PATH=$HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH
+  export PYENV_ROOT="$HOME/.pyenv"
+  eval "$(pyenv init -)"
+  eval "$(pyenv virtualenv-init -)"
 fi
 
 export MAKEFLAGS="-j$(nproc)"
@@ -50,12 +52,6 @@ pip install poetry==1.5.1
 poetry config virtualenvs.prefer-active-python true --local
 
 echo "PYTHONPATH=${PWD}" > $ROOT/.env
-if [[ "$(uname)" == 'Darwin' ]]; then
-  echo "# msgq doesn't work on mac" >> $ROOT/.env
-  echo "export ZMQ=1" >> $ROOT/.env
-  echo "export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES" >> $ROOT/.env
-fi
-
 poetry self add poetry-dotenv-plugin@^0.1.0
 
 echo "pip packages install..."

tools/mac_setup.sh

@@ -46,7 +46,6 @@ brew "libtool"
 brew "llvm"
 brew "openssl@3.0"
 brew "pyenv"
-brew "pyenv-virtualenv"
 brew "qt@5"
 brew "zeromq"
 brew "gcc@12"
@@ -70,8 +69,16 @@ export CPPFLAGS="$CPPFLAGS -I${BREW_PREFIX}/opt/openssl@3/include"
 export PYCURL_CURL_CONFIG=/usr/bin/curl-config
 export PYCURL_SSL_LIBRARY=openssl
 
+# openpilot environment
+if [ -z "$OPENPILOT_ENV" ] && [ -n "$RC_FILE" ] && [ -z "$CI" ]; then
+  echo "source $ROOT/tools/openpilot_env.sh" >> $RC_FILE
+  source "$ROOT/tools/openpilot_env.sh"
+  echo "Added openpilot_env to RC file: $RC_FILE"
+fi
+
 # install python dependencies
 $DIR/install_python_dependencies.sh
+eval "$(pyenv init --path)"
 echo "[ ] installed python dependencies t=$SECONDS"
 
 echo

tools/openpilot_env.sh

@@ -0,0 +1,22 @@
+if [ -z "$OPENPILOT_ENV" ]; then
+  export PATH="$HOME/.pyenv/bin:$PATH"
+
+  # Pyenv suggests we place the below two lines in .profile before we source
+  # .bashrc, but there is no simple way to guarantee we do this correctly
+  # programmatically across heterogeneous systems. For end-user convenience,
+  # we add the lines here as a workaround.
+  # https://github.com/pyenv/pyenv/issues/1906
+  export PYENV_ROOT="$HOME/.pyenv"
+
+  if [[ "$(uname)" == 'Linux' ]]; then
+    eval "$(pyenv virtualenv-init -)"
+  elif [[ "$(uname)" == 'Darwin' ]]; then
+    # msgq doesn't work on mac
+    export ZMQ=1
+    export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
+  fi
+  eval "$(pyenv init --path)"
+  eval "$(pyenv init -)"
+
+  export OPENPILOT_ENV=1
+fi

tools/ubuntu_setup.sh

@@ -141,6 +141,13 @@ fi
 # python setup
 $DIR/install_python_dependencies.sh
 
+source ~/.bashrc
+if [ -z "$OPENPILOT_ENV" ]; then
+  printf "\nsource %s/tools/openpilot_env.sh" "$ROOT" >> ~/.bashrc
+  source ~/.bashrc
+  echo "added openpilot_env to bashrc"
+fi
+
 echo
 echo "----   OPENPILOT SETUP DONE   ----"
 echo "Open a new shell or configure your active shell env by running:"