fixing conda recipe

dkazanc · Mar 21, 2023 · 7248228 · 7248228
1 parent 10152d8
commit 7248228
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.scripts/conda_upload.sh b/.scripts/conda_upload.sh
@@ -19,7 +19,7 @@ export CONDA_BLD_PATH=~/conda-bld
 
 for python_ver in 3.9 3.10; do   
     for numpy_ver in 1.21 1.22 1.23 1.24; do
-        export VERSION=`date +%Y.%m`"-py"$python_ver"_np"$numpy_ver
+        export VERSION=`date +%Y.%m`"_py"$python_ver"_np"$numpy_ver
         conda build . --numpy $numpy_ver --python $python_ver
     done
 done

diff --git a/Demos/Matlab/adding_paths.m b/Demos/Matlab/adding_paths.m
@@ -1,16 +1,17 @@
 % adding paths
 fsep = '/';
+packagename = 'tomobar'
 % TomoPhantom paths (TomoPhantom needs to be compiled first)
-pathtoTomoPhantom = sprintf(['..' fsep '..' fsep 'src' fsep 'Matlab' fsep 'supplementary' fsep 'TomoPhantom' fsep 'Wrappers' fsep 'MATLAB' fsep 'compiled' fsep], 1i);
+pathtoTomoPhantom = sprintf(['..' fsep '..' fsep packagename fsep 'matlab' fsep 'supplementary' fsep 'TomoPhantom' fsep 'Wrappers' fsep 'MATLAB' fsep 'compiled' fsep], 1i);
 addpath(pathtoTomoPhantom);
-pathtoTomoPhantom2 = sprintf(['..' fsep '..' fsep 'src' fsep 'Matlab' fsep  'supplementary' fsep 'TomoPhantom' fsep 'Wrappers' fsep 'MATLAB' fsep 'supplem' fsep], 1i);
+pathtoTomoPhantom2 = sprintf(['..' fsep '..' fsep packagename fsep 'matlab' fsep  'supplementary' fsep 'TomoPhantom' fsep 'Wrappers' fsep 'MATLAB' fsep 'supplem' fsep], 1i);
 addpath(pathtoTomoPhantom2);
-pathtoModels = sprintf(['..' fsep '..' fsep 'src' fsep 'Matlab' fsep 'supplementary' fsep 'TomoPhantom' fsep 'PhantomLibrary' fsep 'models' fsep 'Phantom2DLibrary.dat'], 1i);
+pathtoModels = sprintf(['..' fsep '..' fsep packagename fsep 'matlab' fsep 'supplementary' fsep 'TomoPhantom' fsep 'PhantomLibrary' fsep 'models' fsep 'Phantom2DLibrary.dat'], 1i);
 % Regularisation Toolkit path to compiled library (CCPi-RGTtk needs to be compiled first)
-pathtoRGLtk = sprintf(['..' fsep '..' fsep 'src' fsep 'Matlab' fsep 'supplementary' fsep 'CCPi-Regularisation-Toolkit' fsep 'Wrappers' fsep 'Matlab' fsep 'mex_compile' fsep 'installed'], 1i);
+pathtoRGLtk = sprintf(['..' fsep '..' fsep packagename fsep 'matlab' fsep 'supplementary' fsep 'CCPi-Regularisation-Toolkit' fsep 'Wrappers' fsep 'Matlab' fsep 'mex_compile' fsep 'installed'], 1i);
 addpath(pathtoRGLtk);
 
-pathmainFunc = sprintf(['..' fsep '..' fsep 'src' fsep 'Matlab' fsep 'main_func'], 1i);
+pathmainFunc = sprintf(['..' fsep '..' fsep packagename fsep 'matlab' fsep 'main_func'], 1i);
 addpath(pathmainFunc); 
-pathSupp = sprintf(['..' fsep '..' fsep 'src' fsep 'Matlab' fsep 'supplementary'], 1i);
+pathSupp = sprintf(['..' fsep '..' fsep packagename fsep 'matlab' fsep 'supplementary'], 1i);
 addpath(pathSupp);