opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_22.01' into release_22.05

Browse Source
This commit is contained in:
Nicola Soranzo
2022-08-19 15:28:58 +01:00
parent cccdb496b8 30dc1bf4f9
commit b5a75cac27
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tool_util/xsd/galaxy.xsd
+1 -1
View File
@@ -4171,7 +4171,7 @@ used to generate dynamic options.
</xs:attribute>
<xs:attribute name="startswith" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en">Ignore lines starting with the given string.</xs:documentation>
<xs:documentation xml:lang="en">Keep only lines starting with the given string.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="meta_file_key" type="xs:string">
lib/galaxy/tools/parameters/dynamic_options.py
+1 -1
View File
@@ -655,7 +655,7 @@ class DynamicOptions:
rval = []
field_count = None
for line in reader:
if line.startswith("#") or (self.line_startswith and line.startswith(self.line_startswith)):
if line.startswith("#") or (self.line_startswith and not line.startswith(self.line_startswith)):
continue
line = line.rstrip("\n\r")
if line:
test/functional/tools/select_from_csvdataset.xml
+6 -2
View File
@@ -6,7 +6,7 @@ echo select_single '$select_single' > '$output'
<inputs>
<param name="single" type="data" format="csv" label="single"/>
<param name="select_single" type="select" label="select_single">
<options from_dataset="single" separator="," startswith="Transaction_date">
<options from_dataset="single" separator="," startswith="1/3/09">
<column name="name" index="1"/>
<column name="value" index="2"/>
<validator type="no_options" message="No data is available in single" />
@@ -29,11 +29,15 @@ echo select_single '$select_single' > '$output'
</assert_contents>
</output>
</test>
<!-- test that data from "comment" lines can not be selected, i.e. if the startswith attribute of <options> works-->
<!-- test that only data from lines starting with "1/2/09" can be selected, i.e. if the startswith attribute of <options> works-->
<test expect_failure="true">
<param name="single" value="1.csv" />
<param name="select_single" value="Product" />
</test>
<test expect_failure="true">
<param name="single" value="1.csv" />
<param name="select_single" value="Product2" />
</test>
</tests>
<help>
</help>