Mercurial > repos > bimib > marea_2_0

changeset 42:005831b3ae9c draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author bimib
date Thu, 23 May 2024 20:10:02 +0000
parents 685db5efd073
children fa462a11276c
files marea_2_0/marea.xml
diffstat 1 files changed, 11 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/marea_2_0/marea.xml	Thu May 23 20:04:37 2024 +0000
+++ b/marea_2_0/marea.xml	Thu May 23 20:10:02 2024 +0000
@@ -6,10 +6,11 @@
 	<requirements>
 		<requirement type="package" version="0.25.3">pandas</requirement>
 		<requirement type="package" version="1.6.3">scipy</requirement>
-		<requirement type="package" version="4.6.3">lxml</requirement>
+		<requirement type="package" version="4.9.3">lxml</requirement>
 		<requirement type="package" version="1.1.0">svglib</requirement>
-		<requirement type="package" version="3.5.67">reportlab</requirement>
+		<requirement type="package" version="4.1.0">reportlab</requirement>
 		<requirement type="package" version="2.2.2">pyvips</requirement>
+		<requirement type="package" version="2.7.1">cairosvg</requirement>
 	</requirements>
 	
 	<command detect_errors="exit_code">
@@ -25,37 +26,37 @@
         #if $cond.type_selector == 'datasets':
 			#if $cond.using_RAS.check == 'true':
                 --input_datas
-                #for $data in $cond.input_Datasets:
+                #for $data in $cond.using_RAS.input_Datasets:
                     ${data.input}
                 #end for
 
                 --names
-                #for $data in $cond.input_Datasets:
+                #for $data in $cond.using_RAS.input_Datasets:
                     ${data.input_name}
                 #end for
             #end if
 
 			#if $cond.using_RPS.check == 'true':
                 --input_datas_rps
-                #for $data in $cond.input_Datasets_RPS:
+                #for $data in $cond.using_RPS.input_Datasets_RPS:
                     ${data.input_rps}
                 #end for
 
                 --names_rps
-                #for $data in $cond.input_Datasets_RPS:
+                #for $data in $cond.using_RPS.input_Datasets_RPS:
                     ${data.input_name_rps}
                 #end for
             #end if
         
         #elif $cond.type_selector == 'dataset_class':
 			#if $cond.using_RAS.check == 'true':
-                --input_data ${cond.input_data}
-                --input_class ${cond.input_class}
+                --input_data ${cond.using_RAS.input_data}
+                --input_class ${cond.using_RAS.input_class}
             #end if
 
             #if $cond.using_RPS.check == 'true':
-                --input_data_rps ${cond.input_data_rps}
-                --input_class_rps ${cond.input_class_rps}
+                --input_data_rps ${cond.using_RPS.input_data_rps}
+                --input_class_rps ${cond.using_RPS.input_class_rps}
             #end if
         #end if