diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 060d7ac..fde2adb 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -27,14 +27,11 @@ jobs: with: virtualenvs-create: true virtualenvs-in-project: true - - name: Install Dependencies + - name: Install dependencies run: poetry install -v - - name: Upgrade embedded wheels in the virtualenv - # This is the recommended way to upgrade things like pip within the - # virtualenv. If there is a vulnerability in pip, then Safety will - # alert on it, which is why it's important for these to be up-to-date. - # See: https://github.com/python-poetry/poetry/issues/1651#issuecomment-746486601 - run: poetry run virtualenv --upgrade-embed-wheels + - name: Upgrade embedded tools within virtualenv + # Safety will alert on these even though they aren't technically dependencies + run: poetry run pip install --upgrade pip setuptools wheel - name: Run Tox test suite run: poetry run tox -c .toxrc -e "checks,coverage" - name: Upload coverage data to coveralls.io diff --git a/run b/run index 68a2f67..bbff286 100755 --- a/run +++ b/run @@ -10,9 +10,9 @@ run_install() { exit 1 fi - # Upgrade packages within the virtualenv, like pip - # See: https://github.com/python-poetry/poetry/issues/1651#issuecomment-746486601 - poetry run virtualenv --upgrade-embed-wheels --quiet | sed 's/^SystemExit: None/Completed updating embedded wheels/' + # Upgrade embedded packages within the virtualenv + # Safety will alert on these even though they aren't technically dependencies + poetry run pip install --quiet --upgrade pip setuptools wheel if [ $? != 0 ]; then exit 1 fi