Skip to content

Commit ccb510f

Browse files
committed
Remove duplicate get_external_apt_dependencies.py and re-standardize CI package install logs
1 parent d01dc82 commit ccb510f

4 files changed

Lines changed: 19 additions & 38 deletions

File tree

.github/workflows/daily.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,19 @@ jobs:
8080
8181
if [ "${{ runner.os }}" = "Linux" ]; then
8282
if [ -n "$PACKAGES" ]; then
83+
printf "Installing APT packages:\n $(echo $PACKAGES | sed 's/ /\n /g')\n"
8384
sudo apt-get update -q && sudo apt-get install -qy $PACKAGES
8485
fi
8586
8687
PYTHON_EXECUTABLE="xvfb-run python"
8788
else
8889
if [ "${{ runner.os }}" = "macOS" ] && [ -n "$PACKAGES" ]; then
90+
printf "Installing Homebrew packages:\n $(echo $PACKAGES | sed 's/ /\n /g')\n"
8991
brew install -q $PACKAGES
9092
fi
9193
9294
if [ "${{ runner.os }}" = "Windows" ] && [ -n "$PACKAGES" ]; then
95+
printf "Installing Chocolatey packages:\n $(echo $PACKAGES | sed 's/ /\n /g')\n"
9396
choco install -y $PACKAGES
9497
fi
9598

.github/workflows/stubtest_third_party.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,19 @@ jobs:
6666
6767
if [ "${{ runner.os }}" = "Linux" ]; then
6868
if [ -n "$PACKAGES" ]; then
69-
echo "Installing apt packages: $PACKAGES"
69+
printf "Installing APT packages:\n $(echo $PACKAGES | sed 's/ /\n /g')\n"
7070
sudo apt-get update -q && sudo apt-get install -qy $PACKAGES
7171
fi
7272
7373
PYTHON_EXECUTABLE="xvfb-run python"
7474
else
7575
if [ "${{ runner.os }}" = "macOS" ] && [ -n "$PACKAGES" ]; then
76-
echo "Installing Homebrew packages: $PACKAGES"
76+
printf "Installing Homebrew packages:\n $(echo $PACKAGES | sed 's/ /\n /g')\n"
7777
brew install -q $PACKAGES
7878
fi
7979
8080
if [ "${{ runner.os }}" = "Windows" ] && [ -n "$PACKAGES" ]; then
81-
echo "Installing Chocolatey packages: $PACKAGES"
81+
printf "Installing Chocolatey packages:\n $(echo $PACKAGES | sed 's/ /\n /g')\n"
8282
choco install -y $PACKAGES
8383
fi
8484

.github/workflows/tests.yml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,10 @@ jobs:
5252
- run: uv pip install -r requirements-tests.txt --system
5353
- name: Install required APT packages
5454
run: |
55-
sudo apt-get update -qy
56-
DEPENDENCIES=$( python tests/get_external_apt_dependencies.py )
57-
if [ -n "$DEPENDENCIES" ]; then
58-
printf "Installing APT packages:\n $(echo $DEPENDENCIES | sed 's/ /\n /g')\n"
59-
sudo apt-get install -qy $DEPENDENCIES
55+
PACKAGES=$(python tests/get_stubtest_system_requirements.py)
56+
if [ -n "$PACKAGES" ]; then
57+
printf "Installing APT packages:\n $(echo $PACKAGES | sed 's/ /\n /g')\n"
58+
sudo apt-get update -q && sudo apt-get install -qy $PACKAGES
6059
fi
6160
- name: Run mypy_test.py
6261
run: |
@@ -102,24 +101,23 @@ jobs:
102101
with:
103102
version-file: "requirements-tests.txt"
104103
- name: Install typeshed test-suite requirements
105-
# Install these so we can run `get_external_stub_requirements.py`
104+
# Install these so we can run `get_*_requirements.py`
106105
run: uv pip install -r requirements-tests.txt --system
107106
- name: Install required APT packages
108107
run: |
109-
sudo apt-get update -qy
110-
DEPENDENCIES=$( python tests/get_external_apt_dependencies.py )
111-
if [ -n "$DEPENDENCIES" ]; then
112-
printf "Installing APT packages:\n $(echo $DEPENDENCIES | sed 's/ /\n /g')\n"
113-
sudo apt-get install -qy $DEPENDENCIES
108+
PACKAGES=$(python tests/get_stubtest_system_requirements.py)
109+
if [ -n "$PACKAGES" ]; then
110+
printf "Installing APT packages:\n $(echo $PACKAGES | sed 's/ /\n /g')\n"
111+
sudo apt-get update -q && sudo apt-get install -qy $PACKAGES
114112
fi
115113
- name: Create an isolated venv for testing
116114
run: uv venv .venv
117115
- name: Install 3rd-party stub dependencies
118116
run: |
119-
DEPENDENCIES=$( python tests/get_external_stub_requirements.py )
120-
if [ -n "$DEPENDENCIES" ]; then
121-
printf "Installing packages:\n $(echo $DEPENDENCIES | sed 's/ /\n /g')\n"
122-
uv pip install --python-version ${{ matrix.python-version }} $DEPENDENCIES
117+
PACKAGES=$(python tests/get_external_stub_requirements.py)
118+
if [ -n "$PACKAGES" ]; then
119+
printf "Installing python packages:\n $(echo $PACKAGES | sed 's/ /\n /g')\n"
120+
uv pip install --python-version ${{ matrix.python-version }} $PACKAGES
123121
fi
124122
- name: Activate the isolated venv for the rest of the job
125123
run: echo "$PWD/.venv/bin" >> $GITHUB_PATH

tests/get_external_apt_dependencies.py

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)