Skip to content

Commit ef107aa

Browse files
Merge branch 'main' into fix/issue_6710
2 parents 80da3bd + 6cabb1b commit ef107aa

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

.github/workflows/ci_cd.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ jobs:
252252
.venv\Scripts\Activate.ps1
253253
# Uninstall conflicting dependencies
254254
pip uninstall --yes vtk
255-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
255+
pip install --index-url https://wheels.vtk.org vtk-osmesa==9.3.1
256256
257257
- name: Remove Ansys processes (if any)
258258
shell: powershell
@@ -383,7 +383,7 @@ jobs:
383383
.venv\Scripts\Activate.ps1
384384
# Uninstall conflicting dependencies
385385
pip uninstall --yes vtk
386-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
386+
pip install --index-url https://wheels.vtk.org vtk-osmesa==9.3.1
387387
388388
- name: Remove Ansys processes (if any)
389389
shell: powershell
@@ -461,7 +461,7 @@ jobs:
461461
source .venv/bin/activate
462462
# Uninstall conflicting dependencies
463463
pip uninstall --yes vtk
464-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
464+
pip install --index-url https://wheels.vtk.org vtk-osmesa==9.3.1
465465
466466
- name: Remove Ansys processes (if any)
467467
shell: bash
@@ -534,7 +534,7 @@ jobs:
534534
.venv\Scripts\Activate.ps1
535535
# Uninstall conflicting dependencies
536536
pip uninstall --yes vtk
537-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
537+
pip install --index-url https://wheels.vtk.org vtk-osmesa==9.3.1
538538
539539
- name: Remove Ansys processes (if any)
540540
shell: powershell
@@ -613,7 +613,7 @@ jobs:
613613
source .venv/bin/activate
614614
# Uninstall conflicting dependencies
615615
pip uninstall --yes vtk
616-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
616+
pip install --index-url https://wheels.vtk.org vtk-osmesa==9.3.1
617617
618618
- name: Remove Ansys processes (if any)
619619
shell: bash
@@ -683,7 +683,7 @@ jobs:
683683
.venv\Scripts\Activate.ps1
684684
# Uninstall conflicting dependencies
685685
pip uninstall --yes vtk
686-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
686+
pip install --index-url https://wheels.vtk.org vtk-osmesa==9.3.1
687687
688688
- name: Remove Ansys processes (if any)
689689
shell: powershell
@@ -761,7 +761,7 @@ jobs:
761761
source .venv/bin/activate
762762
# Uninstall conflicting dependencies
763763
pip uninstall --yes vtk
764-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
764+
pip install --index-url https://wheels.vtk.org vtk-osmesa==9.3.1
765765
766766
- name: "Install X Virtual Frame Buffer"
767767
run: |
@@ -836,7 +836,7 @@ jobs:
836836
.venv\Scripts\Activate.ps1
837837
# Uninstall conflicting dependencies
838838
pip uninstall --yes vtk
839-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
839+
pip install --index-url https://wheels.vtk.org vtk-osmesa==9.3.1
840840
841841
- name: Remove Ansys processes (if any)
842842
shell: powershell
@@ -909,7 +909,7 @@ jobs:
909909
.venv\Scripts\Activate.ps1
910910
# Uninstall conflicting dependencies
911911
pip uninstall --yes vtk
912-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
912+
pip install --index-url https://wheels.vtk.org vtk-osmesa==9.3.1
913913
914914
- name: Remove Ansys processes (if any)
915915
shell: powershell

.github/workflows/manual_draft.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
.venv\Scripts\Activate.ps1
7171
# Uninstall conflicting dependencies
7272
pip uninstall --yes vtk
73-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
73+
pip install --index-url https://wheels.vtk.org vtk-osmesa==9.3.1
7474
7575
- name: Remove Ansys processes (if any)
7676
shell: powershell
@@ -193,7 +193,7 @@ jobs:
193193
.venv\Scripts\Activate.ps1
194194
# Uninstall conflicting dependencies
195195
pip uninstall --yes vtk
196-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
196+
pip install --index-url https://wheels.vtk.org vtk-osmesa==9.3.1
197197
198198
- name: Remove Ansys processes (if any)
199199
shell: powershell
@@ -267,7 +267,7 @@ jobs:
267267
source .venv/bin/activate
268268
# Uninstall conflicting dependencies
269269
pip uninstall --yes vtk
270-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
270+
pip install --index-url https://wheels.vtk.org vtk-osmesa==9.3.1
271271
272272
- name: Remove Ansys processes (if any)
273273
shell: bash

doc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ help:
2222
@echo "Removing package(s) to avoid conflicts with package(s) needed for CI/CD"; \
2323
pip uninstall --yes vtk; \
2424
@echo "Installing CI/CD required package(s)"; \
25-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1; \
25+
pip install --index-url https://wheels.vtk.org vtk-osmesa==9.3.1; \
2626
fi
2727

2828
# Catch-all target: route all unknown targets to Sphinx using the new

doc/make.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if NOT "%is_vtk_osmesa_installed%" == "vtk-osmesa" if "%ON_CI%" == "True" (
2121
echo "Removing package(s) to avoid conflicts with package(s) needed for CI/CD"
2222
pip uninstall --yes vtk
2323
echo "Installing CI/CD required package(s)"
24-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1)
24+
pip install --index-url https://wheels.vtk.org vtk-osmesa==9.3.1)
2525
REM End of CICD dedicated setup
2626

2727
if "%1" == "" goto help

0 commit comments

Comments
 (0)