1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/aa68a19aea9d/
Changeset: aa68a19aea9d
User: dan
Date: 2014-11-14 15:19:11+00:00
Summary: Merged in BjoernGruening/galaxy-central-1/documentation_fixes (pull request #564)
Improve the docstring of previously added sniff functions.
Affected #: 2 files
diff -r 65121c7c76af6b5b4501477780432d2ae3ebfc57 -r aa68a19aea9dac59c45b752e4dec6cbee7dc70cc lib/galaxy/datatypes/text.py
--- a/lib/galaxy/datatypes/text.py
+++ b/lib/galaxy/datatypes/text.py
@@ -139,7 +139,8 @@
def sniff( self, filename ):
"""
- Try to load the string with the json module. If successful it's a json file.
+ Try to guess the Obo filetype.
+ It usually starts with a "format-version:" string and has several stanzas which starts with "id:".
"""
stanza = re.compile(r'^\[.*\]$')
with open( filename ) as handle:
diff -r 65121c7c76af6b5b4501477780432d2ae3ebfc57 -r aa68a19aea9dac59c45b752e4dec6cbee7dc70cc lib/galaxy/datatypes/xml.py
--- a/lib/galaxy/datatypes/xml.py
+++ b/lib/galaxy/datatypes/xml.py
@@ -136,7 +136,7 @@
def sniff( self, filename ):
"""
- Try to load the string with the json module. If successful it's a json file.
+ Checking for keyword - '<owl' in the first 200 lines.
"""
owl_marker = re.compile(r'\<owl:')
with open( filename ) as handle:
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
4 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/8e07db95f60c/
Changeset: 8e07db95f60c
Branch: documentation_fixes
User: BjoernGruening
Date: 2014-11-14 15:02:39+00:00
Summary: Created new branch documentation_fixes
Affected #: 0 files
https://bitbucket.org/galaxy/galaxy-central/commits/3b19abef4f22/
Changeset: 3b19abef4f22
Branch: documentation_fixes
User: BjoernGruening
Date: 2014-11-14 15:06:44+00:00
Summary: Improve documentation. Thanks Peter for pointing this out.
Affected #: 1 file
diff -r 8e07db95f60c98ae835865c817cf1361bbde9c82 -r 3b19abef4f22f890d49945a6678e6d18f340d843 lib/galaxy/datatypes/text.py
--- a/lib/galaxy/datatypes/text.py
+++ b/lib/galaxy/datatypes/text.py
@@ -139,7 +139,8 @@
def sniff( self, filename ):
"""
- Try to load the string with the json module. If successful it's a json file.
+ Try to guess the Obo filetype.
+ It usually starts with a "format-version:" string and has several stanzas which starts with "id:".
"""
stanza = re.compile(r'^\[.*\]$')
with open( filename ) as handle:
https://bitbucket.org/galaxy/galaxy-central/commits/623efea83a38/
Changeset: 623efea83a38
Branch: documentation_fixes
User: BjoernGruening
Date: 2014-11-14 15:09:09+00:00
Summary: Improve documentation. Thanks Peter!
Affected #: 1 file
diff -r 3b19abef4f22f890d49945a6678e6d18f340d843 -r 623efea83a38a0ce18a002bd36c5bf9aea4c74dc lib/galaxy/datatypes/xml.py
--- a/lib/galaxy/datatypes/xml.py
+++ b/lib/galaxy/datatypes/xml.py
@@ -136,7 +136,7 @@
def sniff( self, filename ):
"""
- Try to load the string with the json module. If successful it's a json file.
+ Checking for keyword - '<owl' in the first 200 lines.
"""
owl_marker = re.compile(r'\<owl:')
with open( filename ) as handle:
https://bitbucket.org/galaxy/galaxy-central/commits/aa68a19aea9d/
Changeset: aa68a19aea9d
User: dan
Date: 2014-11-14 15:19:11+00:00
Summary: Merged in BjoernGruening/galaxy-central-1/documentation_fixes (pull request #564)
Improve the docstring of previously added sniff functions.
Affected #: 2 files
diff -r 65121c7c76af6b5b4501477780432d2ae3ebfc57 -r aa68a19aea9dac59c45b752e4dec6cbee7dc70cc lib/galaxy/datatypes/text.py
--- a/lib/galaxy/datatypes/text.py
+++ b/lib/galaxy/datatypes/text.py
@@ -139,7 +139,8 @@
def sniff( self, filename ):
"""
- Try to load the string with the json module. If successful it's a json file.
+ Try to guess the Obo filetype.
+ It usually starts with a "format-version:" string and has several stanzas which starts with "id:".
"""
stanza = re.compile(r'^\[.*\]$')
with open( filename ) as handle:
diff -r 65121c7c76af6b5b4501477780432d2ae3ebfc57 -r aa68a19aea9dac59c45b752e4dec6cbee7dc70cc lib/galaxy/datatypes/xml.py
--- a/lib/galaxy/datatypes/xml.py
+++ b/lib/galaxy/datatypes/xml.py
@@ -136,7 +136,7 @@
def sniff( self, filename ):
"""
- Try to load the string with the json module. If successful it's a json file.
+ Checking for keyword - '<owl' in the first 200 lines.
"""
owl_marker = re.compile(r'\<owl:')
with open( filename ) as handle:
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/3ea58a572fef/
Changeset: 3ea58a572fef
User: dan
Date: 2014-11-14 15:10:53+00:00
Summary: Merged in BjoernGruening/galaxy-central-1/fix-ngs_simulation (pull request #563)
Add requirement to the ngs_simulation tool.
Affected #: 1 file
diff -r 3d9e14ac53cc9d10bd6cf1006e4d2c196cd72e9b -r 3ea58a572fefa03bef988886848af74e05080cff tools/ngs_simulation/ngs_simulation.xml
--- a/tools/ngs_simulation/ngs_simulation.xml
+++ b/tools/ngs_simulation/ngs_simulation.xml
@@ -1,6 +1,9 @@
<tool id="ngs_simulation" name="Simulate" version="1.0.0"><!--<tool id="ngs_simulation" name="Simulate" force_history_refresh="True" version="1.0.0">--><description>Illumina runs</description>
+ <requirements>
+ <requirement type="package" version="1.0.3">rpy</requirement>
+ </requirements><command interpreter="python">
ngs_simulation.py
#if $in_type.input_type == "built-in"
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/9c1197f1e259/
Changeset: 9c1197f1e259
Branch: stable
User: natefoo
Date: 2014-11-14 14:00:21+00:00
Summary: Update tag latest_2014.10.06 for changeset e6de07f8c01f
Affected #: 1 file
diff -r e6de07f8c01fe8802282eea1bee326c5efba1b78 -r 9c1197f1e259f7925be467f2f6f92fa3e7a5e86c .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -20,4 +20,4 @@
ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11
548ab24667d6206780237bd807f7d857a484c461 latest_2014.08.11
2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06
-c9759aa6e40f887dec2d27d2f244d6fd7c28e6de latest_2014.10.06
+e6de07f8c01fe8802282eea1bee326c5efba1b78 latest_2014.10.06
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.