Skip to content

Commit

Permalink
Use py 3.10 and mantid 6.8 in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
jl-wynen committed Oct 24, 2023
1 parent 399811c commit 6c77e69
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .buildconfig/ci-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- ipykernel==6.22.0
- ipympl==0.9.3
- ipywidgets==8.0.6
- mantid==6.6.0
- mantid==6.8.0
- matplotlib==3.7.1
- ninja==1.11.1
- plopp==23.04.0
Expand Down
2 changes: 1 addition & 1 deletion .buildconfig/ci-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
- comm=0.1.3 # earlier versions break tests with ipywidgets with latest ipykernel
- h5py==3.8.0
- hypothesis==6.71.0
- mantid==6.6.0
- mantid==6.8.0
- matplotlib==3.7.1
- ninja==1.11.1
- plopp==23.04.0
Expand Down
2 changes: 1 addition & 1 deletion .buildconfig/ci-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
- comm=0.1.3 # earlier versions break tests with ipywidgets with latest ipykernel
- h5py==3.8.0
- hypothesis==6.71.0
- mantid==6.6.0
- mantid==6.8.0
- matplotlib==3.7.1
- ninja==1.11.1
- plopp==23.04.0
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr_and_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- {os: ubuntu-20.04, build-config: ci-linux}
- {os: macos-11, build-config: ci-macos}
- {os: windows-2019, build-config: ci-windows}
python-version: ["3.8"]
python-version: ["3.10"]

steps:
- uses: actions/checkout@v3
Expand All @@ -64,14 +64,14 @@ jobs:
python -m sphinx -j2 -v -b html -d doctrees docs html
python -m sphinx -j2 -v -b doctest -d doctrees docs html
find html -type f -name "*.ipynb" -not -path "html/_sources/*" -delete
if: ${{ contains(matrix.variant.os, 'ubuntu') && matrix.python-version == '3.8' }}
if: ${{ contains(matrix.variant.os, 'ubuntu') && matrix.python-version == '3.10' }}
- run: python -m sphinx -j4 -v -b linkcheck -d doctrees docs html
# Linkcheck can be flaky. Avoid randomly breaking PR builds by running only on `main`
if: ${{ contains(matrix.variant.os, 'ubuntu') && matrix.python-version == '3.8' && github.ref == 'refs/heads/main' }}
if: ${{ contains(matrix.variant.os, 'ubuntu') && matrix.python-version == '3.10' && github.ref == 'refs/heads/main' }}

- uses: actions/upload-artifact@v3
if: ${{ contains(matrix.variant.os, 'ubuntu') && matrix.python-version == '3.8' }}
if: ${{ contains(matrix.variant.os, 'ubuntu') && matrix.python-version == '3.10' }}
with:
name: DocumentationHTML
path: html/
4 changes: 2 additions & 2 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ test:
- pytest==7.3.0
- pytest-asyncio==0.21.0
- pythreejs==2.4.2
- mantid==6.6.0 [py==38]
- mantid==6.8.0 [py==310]
- python-confluent-kafka==1.9.2 [linux64]
- ess-streaming-data-types==v0.14.0 [linux64]
source_files:
Expand All @@ -59,7 +59,7 @@ test:

build:
ignore_run_exports:
- mantid [py==38]
- mantid [py==310]
noarch: python
script:
- python -m pip install .
Expand Down

0 comments on commit 6c77e69

Please sign in to comment.