# HG changeset patch
# User devteam
# Date 1498171904 14400
# Node ID f58ba0382c262d4b809bcf88b30ba884346f2b71
# Parent 659a1c0953576fe36be3202d3827c27fb989a8c2
planemo upload for repository https://github.com/galaxyproject/tools-devteam/tree/master/tool_collections/gops/subtract_query commit cae3e05d02e60f595bb8b6d77a84f030e9bd1689
diff -r 659a1c095357 -r f58ba0382c26 macros.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/macros.xml Thu Jun 22 18:51:44 2017 -0400
@@ -0,0 +1,20 @@
+
+
+
+
+ bx-python
+ galaxy-ops
+
+
+
+-----
+
+**Screencasts!**
+
+See Galaxy Interval Operation Screencasts_ (right click to open this link in another window).
+
+.. _Screencasts: https://galaxyproject.org/learn/interval-operations/
+
+-----
+
+
diff -r 659a1c095357 -r f58ba0382c26 subtract_query.py
--- a/subtract_query.py Fri Dec 18 19:39:32 2015 -0500
+++ b/subtract_query.py Thu Jun 22 18:51:44 2017 -0400
@@ -1,12 +1,14 @@
#!/usr/bin/env python
# Greg Von Kuster
-
"""
Subtract an entire query from another query
usage: %prog in_file_1 in_file_2 begin_col end_col output
--ignore-empty-end-cols: ignore empty end columns when subtracting
"""
+from __future__ import print_function
+
import sys
+
from bx.cookbook import doc_optparse
# Older py compatibility
@@ -81,7 +83,7 @@
try:
fo = open(out_file, 'w')
except:
- print >> sys.stderr, "Unable to open output file"
+ print("Unable to open output file", file=sys.stderr)
sys.exit()
"""
@@ -97,7 +99,7 @@
"""lines1 is now the set of unique lines in inp1_file - the set of unique lines in inp2_file"""
for line in lines1:
- print >> fo, line
+ print(line, file=fo)
fo.close()
@@ -109,7 +111,8 @@
if diff1 > 0:
info_msg += 'Eliminated %d duplicate/blank/comment/invalid lines from first query.' % diff1
- print info_msg
+ print(info_msg)
+
if __name__ == "__main__":
main()
diff -r 659a1c095357 -r f58ba0382c26 subtract_query.xml
--- a/subtract_query.xml Fri Dec 18 19:39:32 2015 -0500
+++ b/subtract_query.xml Thu Jun 22 18:51:44 2017 -0400
@@ -1,87 +1,89 @@
- from another dataset
-
- bx-python
- galaxy-ops
-
-
- subtract_query.py $input1 $input2 $begin_col $end_col $output
- #if str($ignore_empty_end_cols) == 'true':
- --ignore-empty-end-cols
- #end if
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ from another dataset
+
+ macros.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+ ]]>
+
diff -r 659a1c095357 -r f58ba0382c26 tool_dependencies.xml
--- a/tool_dependencies.xml Fri Dec 18 19:39:32 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-