# HG changeset patch
# User iuc
# Date 1540940882 14400
# Node ID 30150bd36c9afeb71857681ea601198332193278
# Parent c8a84e910e6b03339d8d564f76f4ae150d180ecd
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/ncbi_entrez_eutils commit a4b0969b33a68a0ea9ba12291f6694aec24f13ed
diff -r c8a84e910e6b -r 30150bd36c9a __efetch_build_options.py
--- a/__efetch_build_options.py Thu Jul 07 02:40:48 2016 -0400
+++ b/__efetch_build_options.py Tue Oct 30 19:08:02 2018 -0400
@@ -1,6 +1,8 @@
#!/usr/bin/env python
# Daniel Blankenberg
# Creates the options for tool interface
+from __future__ import print_function
+
import re
# http://eutils.ncbi.nlm.nih.gov/entrez/eutils/einfo.fcgi
@@ -164,7 +166,7 @@
section = None
for line in help:
- line = re.split('\s{2,}', line.strip())
+ line = re.split(r'\s{2,}', line.strip())
# Ignore empties
if len(line) == 0:
continue
@@ -214,9 +216,9 @@
format_names = {}
-print '''
+print('''
- '''
+ ''')
for key in sorted(db):
format_options = []
@@ -233,13 +235,13 @@
format_names[format_string] = format_modifier
- print WHEN_TPL.format(
+ print(WHEN_TPL.format(
format=key,
format_options='\n '.join(format_options)
- )
+ ))
-print '''
- '''
+print('''
+ ''')
CHANGE_FORMAT_TPL = '''
@@ -264,4 +266,4 @@
key=k, value=v
))
-print CHANGE_FORMAT_TPL.format(formats='\n '.join(whens))
+print(CHANGE_FORMAT_TPL.format(formats='\n '.join(whens)))
diff -r c8a84e910e6b -r 30150bd36c9a __pycache__/eutils.cpython-35.pyc
Binary file __pycache__/eutils.cpython-35.pyc has changed
diff -r c8a84e910e6b -r 30150bd36c9a ecitmatch.py
--- a/ecitmatch.py Thu Jul 07 02:40:48 2016 -0400
+++ b/ecitmatch.py Tue Oct 30 19:08:02 2018 -0400
@@ -1,5 +1,8 @@
#!/usr/bin/env python
+from __future__ import print_function
+
import argparse
+
import eutils
@@ -48,7 +51,7 @@
'key': tmp[5],
})
except KeyError:
- print "Could not parse line: %s" % line
+ print("Could not parse line: %s" % line)
payload = {
'db': 'pubmed',
@@ -57,4 +60,4 @@
results = c.citmatch(**payload)
# We get data back as pipe separated, so just replace those with tabs
- print results.replace('|', '\t')
+ print(results.replace('|', '\t'))
diff -r c8a84e910e6b -r 30150bd36c9a efetch.py
--- a/efetch.py Thu Jul 07 02:40:48 2016 -0400
+++ b/efetch.py Tue Oct 30 19:08:02 2018 -0400
@@ -1,5 +1,6 @@
#!/usr/bin/env python
import argparse
+
import eutils
diff -r c8a84e910e6b -r 30150bd36c9a egquery.py
--- a/egquery.py Thu Jul 07 02:40:48 2016 -0400
+++ b/egquery.py Tue Oct 30 19:08:02 2018 -0400
@@ -1,5 +1,8 @@
#!/usr/bin/env python
+from __future__ import print_function
+
import argparse
+
import eutils
@@ -17,4 +20,4 @@
'term': args.term,
}
results = c.gquery(**payload)
- print results
+ print(results)
diff -r c8a84e910e6b -r 30150bd36c9a einfo.py
--- a/einfo.py Thu Jul 07 02:40:48 2016 -0400
+++ b/einfo.py Tue Oct 30 19:08:02 2018 -0400
@@ -1,5 +1,8 @@
#!/usr/bin/env python
+from __future__ import print_function
+
import argparse
+
import eutils
@@ -15,4 +18,4 @@
if args.db is not None:
payload['db'] = args.db
payload['version'] = '2.0'
- print c.info(**payload)
+ print(c.info(**payload))
diff -r c8a84e910e6b -r 30150bd36c9a elink.py
--- a/elink.py Thu Jul 07 02:40:48 2016 -0400
+++ b/elink.py Tue Oct 30 19:08:02 2018 -0400
@@ -1,4 +1,6 @@
#!/usr/bin/env python
+from __future__ import print_function
+
import argparse
import json
@@ -56,4 +58,4 @@
history = c.extract_history(results)
args.history_out.write(json.dumps(history, indent=4))
- print results
+ print(results)
diff -r c8a84e910e6b -r 30150bd36c9a epost.py
--- a/epost.py Thu Jul 07 02:40:48 2016 -0400
+++ b/epost.py Tue Oct 30 19:08:02 2018 -0400
@@ -1,5 +1,8 @@
#!/usr/bin/env python
+from __future__ import print_function
+
import argparse
+
import eutils
@@ -24,4 +27,4 @@
payload['id'] = ','.join(merged_ids)
payload['WebEnv'] = ''
- print c.post(args.db, **payload)
+ print(c.post(args.db, **payload))
diff -r c8a84e910e6b -r 30150bd36c9a esearch.py
--- a/esearch.py Thu Jul 07 02:40:48 2016 -0400
+++ b/esearch.py Tue Oct 30 19:08:02 2018 -0400
@@ -1,6 +1,9 @@
#!/usr/bin/env python
+from __future__ import print_function
+
+import argparse
import json
-import argparse
+
import eutils
@@ -44,4 +47,4 @@
history = c.extract_history(results)
args.history_out.write(json.dumps(history, indent=4))
- print results
+ print(results)
diff -r c8a84e910e6b -r 30150bd36c9a esearch.xml
--- a/esearch.xml Thu Jul 07 02:40:48 2016 -0400
+++ b/esearch.xml Tue Oct 30 19:08:02 2018 -0400
@@ -6,15 +6,16 @@
python esearch.py --version
- $default]]>
-
+
@@ -47,25 +48,28 @@
-
-
+
+
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
diff -r c8a84e910e6b -r 30150bd36c9a esummary.py
--- a/esummary.py Thu Jul 07 02:40:48 2016 -0400
+++ b/esummary.py Tue Oct 30 19:08:02 2018 -0400
@@ -1,5 +1,8 @@
#!/usr/bin/env python
+from __future__ import print_function
+
import argparse
+
import eutils
@@ -26,4 +29,4 @@
else:
payload['id'] = ','.join(merged_ids)
- print c.summary(**payload)
+ print(c.summary(**payload))
diff -r c8a84e910e6b -r 30150bd36c9a eutils.py
--- a/eutils.py Thu Jul 07 02:40:48 2016 -0400
+++ b/eutils.py Tue Oct 30 19:08:02 2018 -0400
@@ -1,7 +1,9 @@
+import json
import os
-import json
-import StringIO
+
from Bio import Entrez
+from six import StringIO
+
Entrez.tool = "GalaxyEutils_1_0"
BATCH_SIZE = 200
diff -r c8a84e910e6b -r 30150bd36c9a eutils.pyc
Binary file eutils.pyc has changed
diff -r c8a84e910e6b -r 30150bd36c9a macros.xml
--- a/macros.xml Thu Jul 07 02:40:48 2016 -0400
+++ b/macros.xml Tue Oct 30 19:08:02 2018 -0400
@@ -1,6 +1,6 @@
- 1.1
+ 1.2
--user_email "$__user_email__"
#set admin_emails = ';'.join(str($__admin_users__).split(','))
@@ -50,9 +50,9 @@
materials. Please consult your legal counsel. If you wish to do a large
data mining project on PubMed data, you can enter into a licensing
agreement and lease the data for free from NLM. For more information on
-this please see `http://www.nlm.nih.gov/databases/leased.html `__
+this please see `https://www.nlm.nih.gov/databases/download/data_distrib_main.html `__
-The `full disclaimer `__ is available on
+The `full disclaimer `__ is available on
their website
Liability
@@ -829,19 +829,19 @@
title = {Entrez Programming Utilities Help},
year = {2010},
publisher = {National Center for Biotechnology Information, Bethesda, Maryland},
- note = {http://ww.ncbi.nlm.nih.gov/books/NBK25500/}
+ note = {https://www.ncbi.nlm.nih.gov/books/NBK25500/}
}
- python
- biopython
+ biopython
+ six
-
+
diff -r c8a84e910e6b -r 30150bd36c9a test-data/egquery.1.xml
--- a/test-data/egquery.1.xml Thu Jul 07 02:40:48 2016 -0400
+++ b/test-data/egquery.1.xml Tue Oct 30 19:08:02 2018 -0400
@@ -1,5 +1,5 @@
-
+
bacteriophage
diff -r c8a84e910e6b -r 30150bd36c9a test-data/esearch.pubmed.2014-01-pnas.xml
--- a/test-data/esearch.pubmed.2014-01-pnas.xml Thu Jul 07 02:40:48 2016 -0400
+++ b/test-data/esearch.pubmed.2014-01-pnas.xml Tue Oct 30 19:08:02 2018 -0400
@@ -1,5 +1,5 @@
-
-
+
+
524200
24620368
24613929
@@ -21,5 +21,5 @@
24481252
24477693
24477692
- PNAS[ta] "Proc Natl Acad Sci U S A"[Journal] "Proc Natl Acad Sci U S A"[Journal] Journal 124812 N 2014/01/01[PDAT] PDAT 0 N 2014/02/01[PDAT] PDAT 0 N RANGE AND "Proc Natl Acad Sci U S A"[Journal] AND 2014/01/01[PDAT] : 2014/02/01[PDAT]
+ PNAS[ta] "Proc Natl Acad Sci U S A"[Journal] "Proc Natl Acad Sci U S A"[Journal] Journal 127235 N 2014/01/01[PDAT] PDAT 0 N 2014/02/01[PDAT] PDAT 0 N RANGE AND "Proc Natl Acad Sci U S A"[Journal] AND 2014/01/01[PDAT] : 2014/02/01[PDAT]
diff -r c8a84e910e6b -r 30150bd36c9a test-data/esearch.pubmed.xml
--- a/test-data/esearch.pubmed.xml Thu Jul 07 02:40:48 2016 -0400
+++ b/test-data/esearch.pubmed.xml Tue Oct 30 19:08:02 2018 -0400
@@ -1,5 +1,5 @@
-
-
+
+
2651200
16578858
11186225
@@ -21,5 +21,5 @@
11121066
11121065
11121064
- PNAS[ta] "Proc Natl Acad Sci U S A"[Journal] "Proc Natl Acad Sci U S A"[Journal] Journal 124812 N 97[vi] vi 77218 N AND GROUP "Proc Natl Acad Sci U S A"[Journal] AND 97[vi]
+ PNAS[ta] "Proc Natl Acad Sci U S A"[Journal] "Proc Natl Acad Sci U S A"[Journal] Journal 127235 N 97[vi] vi 78776 N AND GROUP "Proc Natl Acad Sci U S A"[Journal] AND 97[vi]
diff -r c8a84e910e6b -r 30150bd36c9a test-data/esummary.tax.xml
--- a/test-data/esummary.tax.xml Thu Jul 07 02:40:48 2016 -0400
+++ b/test-data/esummary.tax.xml Tue Oct 30 19:08:02 2018 -0400
@@ -1,5 +1,5 @@
-
-
+
+
10239
@@ -13,7 +13,7 @@
- - 2010/11/23 00:00
+ - 2017/06/14 00:00
diff -r c8a84e910e6b -r 30150bd36c9a test-data/pm-tax-neighbor.xml
--- a/test-data/pm-tax-neighbor.xml Thu Jul 07 02:40:48 2016 -0400
+++ b/test-data/pm-tax-neighbor.xml Tue Oct 30 19:08:02 2018 -0400
@@ -1,5 +1,5 @@
-
-
+
+
diff -r c8a84e910e6b -r 30150bd36c9a test-data/pubmed.metadata.xml
--- a/test-data/pubmed.metadata.xml Thu Jul 07 02:40:48 2016 -0400
+++ b/test-data/pubmed.metadata.xml Tue Oct 30 19:08:02 2018 -0400
@@ -1,5 +1,5 @@
-
-
+
+
pubmed
diff -r c8a84e910e6b -r 30150bd36c9a test-data/viruses.tax.xml
--- a/test-data/viruses.tax.xml Thu Jul 07 02:40:48 2016 -0400
+++ b/test-data/viruses.tax.xml Tue Oct 30 19:08:02 2018 -0400
@@ -1,5 +1,5 @@
-
-
+
+
10239
Viruses
@@ -21,9 +21,8 @@
1995/02/27 09:24:00
- 2010/11/23 11:40:11
+ 2017/06/14 10:56:24
1993/04/20 01:00:00
-
-
+
\ No newline at end of file
diff -r c8a84e910e6b -r 30150bd36c9a tool_dependencies.xml
--- a/tool_dependencies.xml Thu Jul 07 02:40:48 2016 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-
-
-
- /please set the administrator's contact email in the corresponding env.sh file/
-
-
-
-
-