Skip to content

Commit 410c614

Browse files
Merge pull request #1074 from mantidproject/1049_fix_github_warnings
Update to Python 3.11
2 parents fe5eeb2 + b807ab6 commit 410c614

File tree

9 files changed

+13
-36
lines changed

9 files changed

+13
-36
lines changed

.github/actions/publish-package/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ runs:
2727
mamba install -c conda-forge mamba conda-build anaconda-client conda-verify boa
2828
conda config --add channels mantid/label/nightly
2929
conda config --add channels mantid
30+
conda config --remove channels defaults
3031
3132
- name: Build package
3233
shell: bash -l {0}

.github/workflows/deploy_conda.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ jobs:
2121
uses: conda-incubator/setup-miniconda@v3
2222
with:
2323
miniforge-version: latest
24+
channels: conda-forge, mantid
25+
conda-remove-defaults: "true"
2426
activate-environment: mslice-env
2527
environment-file: environment.yml
2628
auto-activate-base: false

.github/workflows/deploy_conda_nightly.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ jobs:
3030
uses: conda-incubator/setup-miniconda@v3
3131
with:
3232
miniforge-version: latest
33+
channels: conda-forge, mantid
34+
conda-remove-defaults: "true"
3335
activate-environment: mslice-env
3436
environment-file: environment.yml
3537
auto-activate-base: false

.github/workflows/unit_tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
uses: conda-incubator/setup-miniconda@v3
2020
with:
2121
miniforge-version: latest
22+
channels: conda-forge, mantid
23+
conda-remove-defaults: "true"
2224
activate-environment: mslice-env
2325
environment-file: environment.yml
2426
auto-activate-base: false

.github/workflows/unit_tests_nightly.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
uses: conda-incubator/setup-miniconda@v3
2020
with:
2121
miniforge-version: latest
22+
channels: conda-forge, mantid
23+
conda-remove-defaults: "true"
2224
activate-environment: mslice-env
2325
environment-file: environment.yml
2426
auto-activate-base: false

conda/conda_build_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
python:
2-
- 3.12
2+
- 3.11
33

44
setuptools:
55
- 75.1.0

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ dependencies:
1313
- pyqt
1414
- qtconsole
1515
- qtpy
16-
- python=3.10
16+
- python=3.11

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ authors = [
1212
]
1313
description = "Visualise and slice data from Mantid"
1414
readme = "README.md"
15-
requires-python = ">=3.10"
15+
requires-python = ">=3.11"
1616
classifiers = [
17-
"Programming Language :: Python :: 3.10",
17+
"Programming Language :: Python :: 3.11",
1818
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
1919
"Operating System :: OS Independent",
2020
"Topic :: Scientific/Engineering",

tests/app_test.py

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)