Skip to content

Commit

Permalink
Do not check venv
Browse files Browse the repository at this point in the history
  • Loading branch information
armenzg committed Aug 27, 2021
1 parent cf06765 commit 859f94e
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 20 deletions.
10 changes: 5 additions & 5 deletions .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 ###
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/api-docs-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backend-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backend-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backend-typing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-if-migration-is-required.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/command-line-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/development-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/migrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/plugins-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/relay-integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snuba-integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/symbolicator-integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,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
Expand Down

0 comments on commit 859f94e

Please sign in to comment.