Skip to content

Commit 3f47bab

Browse files
committed
cleanup and consolidate
1 parent 20c54eb commit 3f47bab

File tree

2 files changed

+32
-64
lines changed

2 files changed

+32
-64
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Set up Chrome for pytest
2+
description: Install Chrome/Chromedriver, set BROWSER, and verify the setup
3+
runs:
4+
using: composite
5+
steps:
6+
- name: Set up Chrome
7+
id: setup-chrome
8+
uses: browser-actions/setup-chrome@v2.1.1
9+
with:
10+
install-chromedriver: true
11+
- name: Set BROWSER env var
12+
shell: bash
13+
run: |
14+
echo "BROWSER=${{ steps.setup-chrome.outputs.chrome-path }}" >> $GITHUB_ENV
15+
- name: Check Chrome setup
16+
shell: bash
17+
run: |
18+
CHROME_PATH="${{ steps.setup-chrome.outputs.chrome-path }}"
19+
CHROMEDRIVER_PATH="${{ steps.setup-chrome.outputs.chromedriver-path }}"
20+
echo "Chrome path: $CHROME_PATH"
21+
echo "Chrome version: $($CHROME_PATH --version)"
22+
echo "Chromedriver path: $CHROMEDRIVER_PATH"
23+
echo "Chromedriver version: $($CHROMEDRIVER_PATH --version)"
24+
echo "chrome --version: $(chrome --version)"
25+
echo "BROWSER = $BROWSER"
26+
python -c "import webbrowser; webbrowser.register_standard_browsers(); print(webbrowser._tryorder)"
27+
python -c "import webbrowser; webbrowser.get()"

.github/workflows/run-pytest.yml

Lines changed: 5 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ jobs:
2626
source .venv/bin/activate
2727
uv lock --check
2828
uv sync --extra dev_core
29-
- name: List installed packages and python version
30-
run: |
31-
source .venv/bin/activate
32-
uv pip list
3329
python --version
3430
- name: Test core
3531
run: |
@@ -49,44 +45,19 @@ jobs:
4945
uses: actions/setup-python@v6
5046
with:
5147
python-version: ${{ matrix.python-version }}
52-
- name: Set up Chrome
53-
id: setup-chrome
54-
uses: browser-actions/setup-chrome@v2.1.1
55-
with:
56-
install-chromedriver: true
57-
- name: Print installed Chrome and Chromedriver paths and versions
58-
run: |
59-
CHROME_PATH="${{ steps.setup-chrome.outputs.chrome-path }}"
60-
CHROMEDRIVER_PATH="${{ steps.setup-chrome.outputs.chromedriver-path }}"
61-
echo "Chrome path: $CHROME_PATH"
62-
echo "Chrome version: $($CHROME_PATH --version)"
63-
echo "Chromedriver path: $CHROMEDRIVER_PATH"
64-
echo "Chromedriver version: $($CHROMEDRIVER_PATH --version)"
65-
echo "chrome --version: $(chrome --version)"
66-
- name: Set BROWSER env var
67-
run: |
68-
echo "BROWSER=${{ steps.setup-chrome.outputs.chrome-path }}" >> $GITHUB_ENV
69-
- name: Print Python webbrowser standard browser list
70-
run: |
71-
python -c "import webbrowser; webbrowser.register_standard_browsers(); print(webbrowser._tryorder)"
72-
- name: Check whether we can access Chrome from Python
73-
run: |
74-
python -c "import webbrowser; webbrowser.get()"
48+
- name: Set up Chrome for Pytest
49+
uses: ./.github/actions/setup-chrome-for-pytest
7550
- name: Install dependencies
7651
run: |
7752
curl -LsSf https://astral.sh/uv/install.sh | sh
7853
uv venv
7954
source .venv/bin/activate
8055
uv sync --extra dev_optional
56+
python --version
8157
- name: Test core
8258
run: |
8359
source .venv/bin/activate
8460
python -m pytest tests/test_core
85-
- name: List installed packages and python version
86-
run: |
87-
source .venv/bin/activate
88-
uv pip list
89-
python --version
9061
- name: Test optional
9162
run: |
9263
source .venv/bin/activate
@@ -117,29 +88,8 @@ jobs:
11788
uses: actions/setup-python@v6
11889
with:
11990
python-version: "3.9"
120-
- name: Set up Chrome
121-
id: setup-chrome
122-
uses: browser-actions/setup-chrome@v2.1.1
123-
with:
124-
install-chromedriver: true
125-
- name: Print installed Chrome and Chromedriver paths and versions
126-
run: |
127-
CHROME_PATH="${{ steps.setup-chrome.outputs.chrome-path }}"
128-
CHROMEDRIVER_PATH="${{ steps.setup-chrome.outputs.chromedriver-path }}"
129-
echo "Chrome path: $CHROME_PATH"
130-
echo "Chrome version: $($CHROME_PATH --version)"
131-
echo "Chromedriver path: $CHROMEDRIVER_PATH"
132-
echo "Chromedriver version: $($CHROMEDRIVER_PATH --version)"
133-
echo "chrome --version: $(chrome --version)"
134-
- name: Set BROWSER env var
135-
run: |
136-
echo "BROWSER=${{ steps.setup-chrome.outputs.chrome-path }}" >> $GITHUB_ENV
137-
- name: Print Python webbrowser standard browser list
138-
run: |
139-
python -c "import webbrowser; webbrowser.register_standard_browsers(); print(webbrowser._tryorder)"
140-
- name: Check whether we can access Chrome from Python
141-
run: |
142-
python -c "import webbrowser; webbrowser.get()"
91+
- name: Set up Chrome for browser tests
92+
uses: ./.github/actions/setup-chrome-for-pytest
14393
- name: Install dependencies
14494
run: |
14595
curl -LsSf https://astral.sh/uv/install.sh | sh
@@ -151,11 +101,6 @@ jobs:
151101
run: |
152102
source .venv/bin/activate
153103
python -m pytest tests/test_core
154-
- name: List installed packages and python version
155-
run: |
156-
source .venv/bin/activate
157-
uv pip list
158-
python --version
159104
- name: Test optional
160105
run: |
161106
source .venv/bin/activate
@@ -198,10 +143,6 @@ jobs:
198143
uv sync --extra dev_optional
199144
uv pip uninstall kaleido
200145
uv pip install kaleido==0.2.1
201-
- name: List installed packages and python version
202-
run: |
203-
source .venv/bin/activate
204-
uv pip list
205146
python --version
206147
- name: Test plotly.io image output with Kaleido v0
207148
run: |

0 commit comments

Comments
 (0)