From 28fde3cb7cef039fb2d15cbe406211a0b9063daa Mon Sep 17 00:00:00 2001 From: Gamer025 <33846895+Gamer025@users.noreply.github.com> Date: Sun, 10 Jan 2021 15:52:02 +0100 Subject: [PATCH] Fix wheel error for ci_suit workflow (#56053) Adds wheel package since its required by some setup.py Workflow run with this option added: https://github.com/Gamer025/tgstation/pull/1/checks?check_run_id=1672278250 Gets rid of all the error: invalid command 'bdist_wheel' errors in the ci_suite workflows --- .github/workflows/ci_suite.yml | 2 +- tools/bootstrap/python | 1 + tools/ci/install_build_tools.sh | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index b4465877247..dc1a3453dcb 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -23,7 +23,7 @@ jobs: pip3 install setuptools bash tools/ci/install_build_tools.sh bash tools/ci/install_spaceman_dmm.sh dreamchecker - pip3 install -r tools/requirements.txt + tools/bootstrap/python -c '' - name: Run Linters run: | bash tools/ci/check_filedirs.sh tgstation.dme diff --git a/tools/bootstrap/python b/tools/bootstrap/python index f9ffc13edb6..0c8d7020206 100755 --- a/tools/bootstrap/python +++ b/tools/bootstrap/python @@ -77,6 +77,7 @@ fi # Use pip to install our requirements if [ ! -f "$PythonDir/requirements.txt" ] || [ "$(b2sum < "$Sdk/requirements.txt")" != "$(b2sum < "$PythonDir/requirements.txt")" ]; then echo "Updating dependencies..." + "$PythonExe" -m pip install -U wheel "$PythonExe" -m pip install -U pip -r "$Sdk/requirements.txt" cp "$Sdk/requirements.txt" "$PythonDir/requirements.txt" echo "---" diff --git a/tools/ci/install_build_tools.sh b/tools/ci/install_build_tools.sh index 6c3e267fca3..50311e33912 100644 --- a/tools/ci/install_build_tools.sh +++ b/tools/ci/install_build_tools.sh @@ -7,6 +7,3 @@ source ~/.nvm/nvm.sh nvm install $NODE_VERSION nvm use $NODE_VERSION npm install --global yarn - -pip3 install --user PyYaml -pip3 install --user beautifulsoup4