Skip to content

Commit 123fceb

Browse files
committed
Fix CI notebook text and vision tests
1 parent 283ee27 commit 123fceb

File tree

5 files changed

+28
-20
lines changed

5 files changed

+28
-20
lines changed

.github/workflows/CI-e2e-notebooks-text-vision.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
matrix:
5757
# TODO: add macos
5858
operatingSystem: [ubuntu-latest, windows-latest]
59-
pythonVersion: [3.8, 3.9, "3.10"]
59+
pythonVersion: [3.9, "3.10"]
6060
flights: [""]
6161
notebookGroup: ["vis_nb_group_1", "text_nb_group_1"]
6262

@@ -142,7 +142,8 @@ jobs:
142142
cat installed-requirements-dev.txt
143143
working-directory: raiwidgets
144144

145-
- name: Upload requirements
145+
- if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.9') && (matrix.flights == '') && (matrix.notebookGroup == 'vis_nb_group_1') }}
146+
name: Upload requirements
146147
uses: actions/upload-artifact@v4
147148
with:
148149
name: requirements-dev.txt
@@ -169,5 +170,5 @@ jobs:
169170
if: always()
170171
uses: actions/upload-artifact@v4
171172
with:
172-
name: raiwidgets-e2e-screen-shot
173+
name: raiwidgets-ci-e2e-text-vision-screen-shot-${{ matrix.notebookGroup }}-${{ matrix.flights }}-${{ matrix.operatingSystem }}-${{ matrix.pythonVersion }}
173174
path: ./dist/cypress

.github/workflows/CI-notebook-text.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
matrix:
2222
operatingSystem: [ubuntu-latest, windows-latest]
23-
pythonVersion: [3.8, 3.9, "3.10"]
23+
pythonVersion: [3.9, "3.10"]
2424

2525
runs-on: ${{ matrix.operatingSystem }}
2626

@@ -99,7 +99,8 @@ jobs:
9999
cat installed-requirements-dev.txt
100100
working-directory: raiwidgets
101101

102-
- name: Upload requirements
102+
- if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.9') }}
103+
name: Upload requirements
103104
uses: actions/upload-artifact@v4
104105
with:
105106
name: requirements-dev.txt
@@ -120,5 +121,5 @@ jobs:
120121
if: always()
121122
uses: actions/upload-artifact@v4
122123
with:
123-
name: raiwidgets-e2e-screen-shot
124+
name: raiwidgets-ci-notebook-vision-screen-shot-${{ matrix.operatingSystem }}-${{ matrix.pythonVersion }}
124125
path: dist/cypress

.github/workflows/CI-notebook-vision.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
matrix:
2222
operatingSystem: [ubuntu-latest]
23-
pythonVersion: [3.8, 3.9, "3.10"]
23+
pythonVersion: [3.9, "3.10"]
2424

2525
runs-on: ${{ matrix.operatingSystem }}
2626

@@ -75,6 +75,12 @@ jobs:
7575
pip install .
7676
working-directory: raiwidgets
7777

78+
- name: Install fastai and latest spacy individually to fix conflicts
79+
shell: bash -l {0}
80+
run: |
81+
pip install fastai
82+
pip install --upgrade "spacy<4"
83+
7884
- name: Install vision dependencies
7985
shell: bash -l {0}
8086
run: |
@@ -96,7 +102,8 @@ jobs:
96102
cat installed-requirements-dev.txt
97103
working-directory: raiwidgets
98104

99-
- name: Upload requirements
105+
- if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.9') }}
106+
name: Upload requirements
100107
uses: actions/upload-artifact@v4
101108
with:
102109
name: requirements-dev.txt
@@ -110,12 +117,12 @@ jobs:
110117
if: always()
111118
uses: actions/upload-artifact@v4
112119
with:
113-
name: notebook-test-${{ matrix.operatingSystem }}-${{ matrix.pythonVersion }}
120+
name: ci-notebook-vision-test-${{ matrix.operatingSystem }}-${{ matrix.pythonVersion }}
114121
path: notebooks
115122

116123
- name: Upload e2e test screen shot
117124
if: always()
118125
uses: actions/upload-artifact@v4
119126
with:
120-
name: raiwidgets-e2e-screen-shot
127+
name: raiwidgets-ci-notebook-vision-screen-shot-${{ matrix.operatingSystem }}-${{ matrix.pythonVersion }}
121128
path: dist/cypress

.github/workflows/CI-responsibleai-text-vision-pytest.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,15 @@ jobs:
1616
matrix:
1717
packageDirectory: ["responsibleai_text", "responsibleai_vision"]
1818
operatingSystem: [ubuntu-latest, macos-latest, windows-latest]
19-
pythonVersion: ["3.8", "3.9", "3.10"]
19+
pythonVersion: ["3.9", "3.10"]
2020
# TODO: re-add macos-latest once build timeout issues are resolved
2121
exclude:
22-
- packageDirectory: "responsibleai_text"
23-
operatingSystem: macos-latest
24-
pythonVersion: "3.8"
2522
- packageDirectory: "responsibleai_text"
2623
operatingSystem: macos-latest
2724
pythonVersion: "3.9"
2825
- packageDirectory: "responsibleai_text"
2926
operatingSystem: macos-latest
3027
pythonVersion: "3.10"
31-
- packageDirectory: "responsibleai_vision"
32-
operatingSystem: macos-latest
33-
pythonVersion: "3.8"
3428
- packageDirectory: "responsibleai_vision"
3529
operatingSystem: macos-latest
3630
pythonVersion: "3.9"
@@ -78,6 +72,13 @@ jobs:
7872
pip install tf-keras
7973
pip install keras==2.15
8074
75+
- if: ${{ (matrix.packageDirectory == 'responsibleai_vision') }}
76+
name: Install fastai and latest spacy individually to fix conflicts
77+
shell: bash -l {0}
78+
run: |
79+
pip install fastai
80+
pip install --upgrade "spacy<4"
81+
8182
- name: Install dependencies
8283
shell: bash -l {0}
8384
run: |

responsibleai_vision/requirements-dev.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@ sphinx==3.1.1
2121
sphinx-gallery==0.8.1
2222
pydata-sphinx-theme==0.3.0
2323

24-
tensorflow<=2.15
24+
tensorflow
2525
transformers
2626
datasets
2727
opencv-python
2828

29-
fastai
3029
mlflow
31-
pydantic<2.0.0
3230
piexif

0 commit comments

Comments
 (0)