Commit 0eb18da0 authored by Morgan, Zachary's avatar Morgan, Zachary
Browse files

Merge branch 'mantid_6.14_update' into 'main' 

mantid 6.14 update

See merge request !8
parents 80fe95b7 800c7d2a

scd-reduction-tools-dev.yml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ channels: 
  - conda-forge



dependencies:

  - mantid>=6.13,<6.14

  - mantid>=6.14,<6.15

  - numpy

  - pycifrw

  - gemmi

scd-reduction-tools-qa.yml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ channels: 
  - conda-forge



dependencies:

  - mantid>=6.13,<6.14

  - mantid>=6.14,<6.15

  - numpy

  - pycifrw

  - matplotlib

scd-reduction-tools.yml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ channels: 
  - conda-forge



dependencies:

  - mantid>=6.13,<6.14

  - mantid>=6.14,<6.15

  - numpy

  - pycifrw

  - matplotlib