Skip to content

Commit 7485001

Browse files
imatiach-msftimatiach-msft
committed
Fix CI notebook text and vision tests
1 parent 283ee27 commit 7485001

File tree

5 files changed

+32
-25
lines changed

5 files changed

+32
-25
lines changed

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

Lines changed: 6 additions & 4 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

@@ -103,7 +103,6 @@ jobs:
103103
shell: bash -l {0}
104104
run: |
105105
pip install tf-keras
106-
pip install keras==2.15
107106
108107
- name: Install dependencies
109108
shell: bash -l {0}
@@ -117,6 +116,8 @@ jobs:
117116
name: Install vision dependencies
118117
shell: bash -l {0}
119118
run: |
119+
pip install fastai
120+
pip install --upgrade "spacy<4"
120121
pip install -r requirements-dev.txt
121122
pip install .
122123
working-directory: responsibleai_vision
@@ -142,7 +143,8 @@ jobs:
142143
cat installed-requirements-dev.txt
143144
working-directory: raiwidgets
144145

145-
- name: Upload requirements
146+
- if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.9') && (matrix.flights == '') && (matrix.notebookGroup == 'vis_nb_group_1') }}
147+
name: Upload requirements
146148
uses: actions/upload-artifact@v4
147149
with:
148150
name: requirements-dev.txt
@@ -169,5 +171,5 @@ jobs:
169171
if: always()
170172
uses: actions/upload-artifact@v4
171173
with:
172-
name: raiwidgets-e2e-screen-shot
174+
name: raiwidgets-ci-e2e-text-vision-screen-shot-${{ matrix.notebookGroup }}-${{ matrix.flights }}-${{ matrix.operatingSystem }}-${{ matrix.pythonVersion }}
173175
path: ./dist/cypress

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

Lines changed: 4 additions & 4 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

@@ -71,7 +71,6 @@ jobs:
7171
shell: bash -l {0}
7272
run: |
7373
pip install tf-keras
74-
pip install keras==2.15
7574
7675
- name: Install dependencies
7776
shell: bash -l {0}
@@ -99,7 +98,8 @@ jobs:
9998
cat installed-requirements-dev.txt
10099
working-directory: raiwidgets
101100

102-
- name: Upload requirements
101+
- if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.9') }}
102+
name: Upload requirements
103103
uses: actions/upload-artifact@v4
104104
with:
105105
name: requirements-dev.txt
@@ -120,5 +120,5 @@ jobs:
120120
if: always()
121121
uses: actions/upload-artifact@v4
122122
with:
123-
name: raiwidgets-e2e-screen-shot
123+
name: raiwidgets-ci-notebook-vision-screen-shot-${{ matrix.operatingSystem }}-${{ matrix.pythonVersion }}
124124
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: 10 additions & 10 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"
@@ -51,13 +45,13 @@ jobs:
5145
name: Install pytorch on non-MacOS
5246
shell: bash -l {0}
5347
run: |
54-
conda install --yes --quiet pytorch==1.13.1 "torchvision<0.15" cpuonly "numpy<1.24.0" -c pytorch
48+
conda install --yes --quiet pytorch torchvision cpuonly "numpy<1.24.0" -c pytorch
5549
5650
- if: ${{ matrix.operatingSystem == 'macos-latest' }}
5751
name: Install Anaconda packages on MacOS, which should not include cpuonly according to official docs
5852
shell: bash -l {0}
5953
run: |
60-
conda install --yes --quiet pytorch==1.13.1 "torchvision<0.15" "numpy<1.24.0" -c pytorch
54+
conda install --yes --quiet pytorch torchvision "numpy<1.24.0" -c pytorch
6155
6256
- name: Setup tools
6357
shell: bash -l {0}
@@ -76,7 +70,13 @@ jobs:
7670
shell: bash -l {0}
7771
run: |
7872
pip install tf-keras
79-
pip install keras==2.15
73+
74+
- if: ${{ (matrix.packageDirectory == 'responsibleai_vision') }}
75+
name: Install fastai and latest spacy individually to fix conflicts
76+
shell: bash -l {0}
77+
run: |
78+
pip install fastai
79+
pip install --upgrade "spacy<4"
8080
8181
- name: Install dependencies
8282
shell: bash -l {0}

‎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)