Skip to content

Commit

Permalink
Merge pull request #109 from KrisThielemans/STIR_v6.0.0
Browse files Browse the repository at this point in the history
update to STIR 6.0.0
  • Loading branch information
KrisThielemans authored Feb 7, 2024
2 parents 5a79f83 + 8a60678 commit 567a6c2
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 16 deletions.
2 changes: 2 additions & 0 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
azure:
free_disk_space: true
build_platform:
osx_arm64: osx_64
conda_build:
Expand Down
4 changes: 2 additions & 2 deletions recipe/activate.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@REM set where STIR installed JSON files are
@set "STIR_CONFIG_DIR=%CONDA_PREFIX%\Library\share\stir\config"
@set "STIR_DOC_DIR=%CONDA_PREFIX%\Library\share\doc\stir-5.2"
@set "STIR_CONFIG_DIR=%CONDA_PREFIX%\Library\share\STIR-6.0\config"
@set "STIR_DOC_DIR=%CONDA_PREFIX%\Library\share\doc\STIR-6.0"

@REM echo ACTIVATED STIR_CONFIG_DIR TO %STIR_CONFIG_DIR%

4 changes: 2 additions & 2 deletions recipe/activate.csh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# set where STIR installed JSON files are
setenv STIR_CONFIG_DIR "${CONDA_PREFIX}/share/stir/config"
setenv STIR_DOC_DIR "${CONDA_PREFIX}/share/doc/stir-5.2"
setenv STIR_CONFIG_DIR "${CONDA_PREFIX}/share/STIR-6.0/config"
setenv STIR_DOC_DIR "${CONDA_PREFIX}/share/doc/STIR-6.0"

# echo "STIR ACTIVATE STIR_CONFIG_DIR TO $STIR_CONFIG_DIR"
4 changes: 2 additions & 2 deletions recipe/activate.fish
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# set where STIR installed JSON files are
set -gx STIR_CONFIG_DIR "${CONDA_PREFIX}/share/stir/config"
set -gx STIR_DOC_DIR "${CONDA_PREFIX}/share/doc/stir-5.2"
set -gx STIR_CONFIG_DIR "${CONDA_PREFIX}/share/STIR-6.0/config"
set -gx STIR_DOC_DIR "${CONDA_PREFIX}/share/doc/STIR-6.0"

# echo "STIR ACTIVATE STIR_CONFIG_DIR TO $STIR_CONFIG_DIR"
4 changes: 2 additions & 2 deletions recipe/activate.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# set where STIR installed JSON files are
$Env:STIR_CONFIG_DIR="$Env:CONDA_PREFIX\Library\share\stir\config"
$Env:STIR_DOC_DIR="$Env:CONDA_PREFIX\Library\share\doc\stir-5.2"
$Env:STIR_CONFIG_DIR="$Env:CONDA_PREFIX\Library\share\STIR-6.0\config"
$Env:STIR_DOC_DIR="$Env:CONDA_PREFIX\Library\share\doc\STIR-6.0"

# echo "STIR ACTIVATE STIR_CONFIG_DIR TO $Env:STIR_CONFIG_DIR"

Expand Down
4 changes: 2 additions & 2 deletions recipe/activate.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# set where STIR installed JSON files are
STIR_CONFIG_DIR="${CONDA_PREFIX}/share/stir/config"
STIR_CONFIG_DIR="${CONDA_PREFIX}/share/STIR-6.0/config"
export STIR_CONFIG_DIR

STIR_DOC_DIR="${CONDA_PREFIX}/share/doc/stir-5.2"
STIR_DOC_DIR="${CONDA_PREFIX}/share/doc/STIR-6.0"
export STIR_DOC_DIR

# echo "STIR ACTIVATE STIR_CONFIG_DIR TO $STIR_CONFIG_DIR"
2 changes: 1 addition & 1 deletion recipe/deactivate.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@set "STIR_CONFIG_DIR="

@set "STIR_DOC_DIR="
1 change: 1 addition & 0 deletions recipe/deactivate.csh
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
unsetenv STIR_CONFIG_DIR
unsetenv STIR_DOC_DIR
1 change: 1 addition & 0 deletions recipe/deactivate.fish
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
set -e STIR_CONFIG_DIR
set -e STIR_DOC_DIR
2 changes: 1 addition & 1 deletion recipe/deactivate.ps1
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
$Env:STIR_CONFIG_DIR=""

$Env:STIR_DOC_DIR=""

1 change: 1 addition & 0 deletions recipe/deactivate.sh
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
unset STIR_CONFIG_DIR
unset STIR_DOC_DIR
7 changes: 3 additions & 4 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@

{% set name = "STIR" %}
{% set version = "5.2.0" %}
{% set build_number = 3 %}

{% set version = "6.0.0" %}
{% set build_number = 0 %}
{% if cuda_compiler_version != "None" %}
{% set build_number = build_number + 200 %}
{% endif %}
Expand All @@ -13,7 +12,7 @@ package:

source:
url: https://github.com/UCL/STIR/archive/refs/tags/rel_{{ version }}.tar.gz
sha256: fa33ef6cfe46f3e2e0797415a038688bcd269d90a51a5bf65910edcf100de6fd
sha256: 35ffe95c46fdaa6fc566308c0b56b0ee978a80165782d8036b9e490018fa2d48

build:
number: {{ build_number }}
Expand Down

0 comments on commit 567a6c2

Please sign in to comment.