Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/actions/publish-package/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ runs:
mamba install -c conda-forge mamba conda-build anaconda-client conda-verify boa
conda config --add channels mantid/label/nightly
conda config --add channels mantid
conda config --remove channels defaults

- name: Build package
shell: bash -l {0}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/deploy_conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-version: latest
channels: conda-forge, mantid
conda-remove-defaults: "true"
activate-environment: mslice-env
environment-file: environment.yml
auto-activate-base: false
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/deploy_conda_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ jobs:
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-version: latest
channels: conda-forge, mantid
conda-remove-defaults: "true"
activate-environment: mslice-env
environment-file: environment.yml
auto-activate-base: false
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-version: latest
channels: conda-forge, mantid
conda-remove-defaults: "true"
activate-environment: mslice-env
environment-file: environment.yml
auto-activate-base: false
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/unit_tests_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-version: latest
channels: conda-forge, mantid
conda-remove-defaults: "true"
activate-environment: mslice-env
environment-file: environment.yml
auto-activate-base: false
Expand Down
2 changes: 1 addition & 1 deletion conda/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
python:
- 3.12
- 3.11

setuptools:
- 75.1.0
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ dependencies:
- pyqt
- qtconsole
- qtpy
- python=3.10
- python=3.11
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ authors = [
]
description = "Visualise and slice data from Mantid"
readme = "README.md"
requires-python = ">=3.10"
requires-python = ">=3.11"
classifiers = [
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
"Operating System :: OS Independent",
"Topic :: Scientific/Engineering",
Expand Down
32 changes: 0 additions & 32 deletions tests/app_test.py

This file was deleted.

Loading