Do not check venv

Author: armenzg

.envrc

@@ -170,12 +170,12 @@ make setup-git-config
 export PYENV_VERSION=$(query-pyenv-version)
 make setup-pyenv
 
-venv_name="${SENTRY_TOPLEVEL}/.venv"
+venv_name=".venv"
 
 if [ ! -f "${venv_name}/bin/activate" ]; then
     prompt_python_venv_creation
     # This is time consuming but it has to be done
-    source "${SENTRY_TOPLEVEL}/scripts/bootstrap-py3-venv"
+    source "./scripts/bootstrap-py3-venv"
 fi
 
 # The user might be cd'ing into sentry with another non-direnv managed
@@ -189,12 +189,12 @@ source "${venv_name}/bin/activate"
 #      but we'd have to patch direnv, and ".venv" isn't descriptive anyways
 unset PS1
 
+debug "Ensuring proper virtualenv..."
+"${SENTRY_TOPLEVEL}/scripts/ensure-venv.sh"
+
 if ! require sentry; then
     warn "Your virtualenv is activated, but sentry doesn't seem to be installed."
     commands_to_run+=("make install-py-dev")
-else
-    debug "Ensuring proper virtualenv..."
-    "${SENTRY_TOPLEVEL}/scripts/ensure-venv.sh"
 fi
 
 ### pre-commit ###

.github/workflows/acceptance.yml

@@ -154,7 +154,7 @@ jobs:
       - name: Set python version output
         id: python-version
         run: |
-          echo "::set-output name=python-version::$(./scripts/do.sh query-pyenv-version)"
+          echo "::set-output name=python-version::$(SENTRY_NO_VENV_CHECK=1 ./scripts/do.sh query-pyenv-version)"
 
       # Until GH composite actions can use `uses`, we need to setup python here
       - uses: actions/setup-python@v2
@@ -236,7 +236,7 @@ jobs:
       - name: Set python version output
         id: python-version
         run: |
-          echo "::set-output name=python-version::$(./scripts/do.sh query-pyenv-version)"
+          echo "::set-output name=python-version::$(SENTRY_NO_VENV_CHECK=1 ./scripts/do.sh query-pyenv-version)"
 
       # Until GH composite actions can use `uses`, we need to setup python here
       - uses: actions/setup-python@v2

.github/workflows/api-docs-test.yml

@@ -31,8 +31,8 @@ jobs:
         if: steps.changes.outputs.api_docs == 'true'
         run: |
           env | sort
-          ./scripts/do.sh query-pyenv-version
-          echo "::set-output name=python-version::$(./scripts/do.sh query-pyenv-version)"
+          SENTRY_NO_VENV_CHECK=1 ./scripts/do.sh query-pyenv-version
+          echo "::set-output name=python-version::$(SENTRY_NO_VENV_CHECK=1 ./scripts/do.sh query-pyenv-version)"
 
       # Until GH composite actions can use `uses`, we need to setup python here
       - uses: actions/setup-python@v2

.github/workflows/backend-lint.yml

@@ -41,7 +41,7 @@ jobs:
         id: python-version
         if: steps.changes.outputs.backend == 'true'
         run: |
-          echo "::set-output name=python-version::$(./scripts/do.sh query-pyenv-version)"
+          echo "::set-output name=python-version::$(SENTRY_NO_VENV_CHECK=1 ./scripts/do.sh query-pyenv-version)"
 
       # Until GH composite actions can use `uses`, we need to setup python here
       - uses: actions/setup-python@v2

.github/workflows/backend-test.yml

@@ -45,7 +45,7 @@ jobs:
         id: python-version
         if: steps.changes.outputs.backend == 'true'
         run: |
-          echo "::set-output name=python-version::$(./scripts/do.sh query-pyenv-version)"
+          echo "::set-output name=python-version::$(SENTRY_NO_VENV_CHECK=1 ./scripts/do.sh query-pyenv-version)"
 
       # Until GH composite actions can use `uses`, we need to setup python here
       - uses: actions/setup-python@v2

.github/workflows/backend-typing.yml

@@ -33,7 +33,7 @@ jobs:
         id: python-version
         if: steps.changes.outputs.backend == 'true'
         run: |
-          echo "::set-output name=python-version::$(./scripts/do.sh query-pyenv-version)"
+          echo "::set-output name=python-version::$(SENTRY_NO_VENV_CHECK=1 ./scripts/do.sh query-pyenv-version)"
 
       # Until GH composite actions can use `uses`, we need to setup python here
       - uses: actions/setup-python@v2

.github/workflows/check-if-migration-is-required.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Set python version output
         id: python-version
         run: |
-          echo "::set-output name=python-version::$(./scripts/do.sh query-pyenv-version)"
+          echo "::set-output name=python-version::$(SENTRY_NO_VENV_CHECK=1 ./scripts/do.sh query-pyenv-version)"
 
       # Until GH composite actions can use `uses`, we need to setup python here
       - uses: actions/setup-python@v2

.github/workflows/command-line-test.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Set python version output
         id: python-version
         run: |
-          echo "::set-output name=python-version::$(./scripts/do.sh query-pyenv-version)"
+          echo "::set-output name=python-version::$(SENTRY_NO_VENV_CHECK=1 ./scripts/do.sh query-pyenv-version)"
 
       # Until GH composite actions can use `uses`, we need to setup python here
       - uses: actions/setup-python@v2

.github/workflows/development-environment.yml

@@ -44,7 +44,7 @@ jobs:
       - name: Set environment variables & others
         id: info
         run: |
-          echo "::set-output name=python-version::$(./scripts/do.sh query-pyenv-version)"
+          echo "::set-output name=python-version::$(SENTRY_NO_VENV_CHECK=1 ./scripts/do.sh query-pyenv-version)"
           echo "::set-output name=pip-cache-dir::$(pip3 cache dir)"
           echo "::set-output name=pip-version::$(pip -V | awk -F ' ' '{print $2}')"
           echo "::set-output name=yarn-cache-dir::$(yarn cache dir)"

.github/workflows/migrations.yml

@@ -51,7 +51,7 @@ jobs:
       - name: Set python version output
         id: python-version
         run: |
-          echo "::set-output name=python-version::$(./scripts/do.sh query-pyenv-version)"
+          echo "::set-output name=python-version::$(SENTRY_NO_VENV_CHECK=1 ./scripts/do.sh query-pyenv-version)"
 
       # Until GH composite actions can use `uses`, we need to setup python here
       - uses: actions/setup-python@v2