1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/8ecfa22f0d98/
changeset: r5075:8ecfa22f0d98
user: jgoecks
date: 2011-02-17 03:46:23
summary: Fix bug in extract_genomic_dna to handle non-GFF files when interpret features is true. Tweak functional test to cover new behavior.
affected #: 2 files (16 bytes)
--- a/tools/extract/extract_genomic_dna.py Wed Feb 16 13:50:30 2011 -0500
+++ b/tools/extract/extract_genomic_dna.py Wed Feb 16 21:46:23 2011 -0500
@@ -234,7 +234,7 @@
fout.write( "%s\n" % str( sequence[c:b] ) )
c = b
else: # output_format == "interval"
- if interpret_features:
+ if gff_format and interpret_features:
# TODO: need better GFF Reader to capture all information needed
# to produce this line.
meta_data = "\t".join(
--- a/tools/extract/extract_genomic_dna.xml Wed Feb 16 13:50:30 2011 -0500
+++ b/tools/extract/extract_genomic_dna.xml Wed Feb 16 21:46:23 2011 -0500
@@ -70,7 +70,7 @@
</test><test><param name="input" value="1.bed" dbkey="hg17" ftype="bed" />
- <param name="interpret_features" value="no"/>
+ <param name="interpret_features" value="yes"/><param name="index_source" value="cached"/><param name="out_format" value="interval"/><output name="out_file1" file="extract_genomic_dna_out3.interval" />
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 changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/89190bcd1ccf/
changeset: r5074:89190bcd1ccf
user: dannon
date: 2011-02-16 19:50:30
summary: Quick fix for postgres9 JSONType/MetadataType hex decoding issues.
Todo: Postgres9 might be configurable to do this natively, postgres8 does not have the issue.
affected #: 1 file (305 bytes)
--- a/lib/galaxy/model/custom_types.py Wed Feb 16 13:48:14 2011 -0500
+++ b/lib/galaxy/model/custom_types.py Wed Feb 16 13:50:30 2011 -0500
@@ -4,6 +4,7 @@
import simplejson
import pickle
import copy
+import binascii
from galaxy.util.bunch import Bunch
from galaxy.util.aliaspickler import AliasPickleModule
@@ -14,8 +15,20 @@
json_encoder = simplejson.JSONEncoder( sort_keys=True )
json_decoder = simplejson.JSONDecoder( )
+def _sniffnfix_pg9_hex(value):
+ """
+ Sniff for and fix postgres 9 hex decoding issue
+ """
+ try:
+ if value[0] == 'x':
+ return binascii.unhexlify(value[1:])
+ else:
+ return value
+ except Exception, ex:
+ return value
+
class JSONType( TypeDecorator ):
- """
+ """
Defines a JSONType for SQLAlchemy. Takes a primitive as input and
JSONifies it. This should replace PickleType throughout Galaxy.
"""
@@ -29,16 +42,16 @@
def process_result_value( self, value, dialect ):
if value is None:
return None
- return json_decoder.decode( str( value ) )
-
+ return json_decoder.decode( str( _sniffnfix_pg9_hex(value) ) )
+
def copy_value( self, value ):
# return json_decoder.decode( json_encoder.encode( value ) )
return copy.deepcopy( value )
def compare_values( self, x, y ):
- # return json_encoder.encode( x ) == json_encoder.encode( y )
- return ( x == y )
-
+ # return json_encoder.encode( x ) == json_encoder.encode( y )
+ return ( x == y )
+
def is_mutable( self ):
return True
@@ -61,11 +74,11 @@
ret = dict( ret.__dict__ )
except:
try:
- ret = json_decoder.decode( str( value ) )
+ ret = json_decoder.decode( str( _sniffnfix_pg9_hex(value) ) )
except:
ret = None
return ret
-
+
class TrimmedString( TypeDecorator ):
impl = String
def process_bind_param( self, value, dialect ):
@@ -73,4 +86,4 @@
if self.impl.length and value is not None:
value = value[0:self.impl.length]
return value
-
+
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 changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/9a547a8f0d49/
changeset: r5073:9a547a8f0d49
user: natefoo
date: 2011-02-16 19:48:14
summary: Fix unit tests failing on missing dependencies in job runners
affected #: 1 file (86 bytes)
--- a/run_unit_tests.sh Wed Feb 16 13:37:13 2011 -0500
+++ b/run_unit_tests.sh Wed Feb 16 13:48:14 2011 -0500
@@ -1,7 +1,9 @@
#!/bin/sh
## Excluding controllers due to the problematic genetrack dependency
+## Excluding job runners due to various external dependencies
python ./scripts/nosetests.py -v -w lib \
--with-nosehtml --html-report-file run_unit_tests.html \
- --with-doctest --exclude=functional --exclude="^get" --exclude=controllers
+ --with-doctest --exclude=functional --exclude="^get" \
+ --exclude=controllers --exclude=runners
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 changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/53ea14cb5909/
changeset: r5072:53ea14cb5909
user: natefoo
date: 2011-02-16 19:37:13
summary: Add test data repository setup directly to the buildbot setup script.
affected #: 1 file (347 bytes)
--- a/buildbot_setup.sh Wed Feb 16 12:56:18 2011 -0500
+++ b/buildbot_setup.sh Wed Feb 16 13:37:13 2011 -0500
@@ -115,4 +115,17 @@
cp test-data/wig_to_bigwig_hg17.len tool-data/shared/ucsc/chrom/hg17.len
fi
+if [ -d "test-data-repo" ]; then
+ echo "Updating test data repository"
+ cd test-data-repo
+ hg pull
+ hg update
+ cd ..
+else
+ echo "Cloning test data repository"
+ hg clone http://bitbucket.org/natefoo/galaxy-test-data/ test-data-repo
+fi
+echo "Setting up test data location files"
+python test-data-repo/location/make_location.py
+
python ./scripts/fetch_eggs.py all
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 changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/5f2047e0eb18/
changeset: r5071:5f2047e0eb18
user: jgoecks
date: 2011-02-16 18:56:18
summary: Bug fix: do not fix strand in extract_genomic_dna tool.
affected #: 1 file (1 byte)
--- a/tools/extract/extract_genomic_dna.py Wed Feb 16 10:14:24 2011 -0500
+++ b/tools/extract/extract_genomic_dna.py Wed Feb 16 12:56:18 2011 -0500
@@ -120,7 +120,7 @@
twobitfile = None
file_iterator = open( input_filename )
if gff_format and interpret_features:
- file_iterator = gff_util.GFFReaderWrapper( file_iterator, fix_strand=True )
+ file_iterator = gff_util.GFFReaderWrapper( file_iterator, fix_strand=False )
for i, feature in enumerate( file_iterator ):
if gff_format and interpret_features:
# Processing features.
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 changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/ca0c4ad2bb39/
changeset: r5070:ca0c4ad2bb39
user: greg
date: 2011-02-16 16:14:24
summary: When rendering the contents of a data library, make sure a LibraryDataset has an associated LibraryDatasetDatasetAssociation. There should always be an ldda, but some users running their own instances have reported that some of their LibraryDatasets are missing these associations.
affected #: 1 file (554 bytes)
--- a/templates/library/common/browse_library.mako Wed Feb 16 09:54:49 2011 -0500
+++ b/templates/library/common/browse_library.mako Wed Feb 16 10:14:24 2011 -0500
@@ -438,9 +438,14 @@
%for library_dataset in library_datasets:
<%
ldda = library_dataset.library_dataset_dataset_association
- selected = created_ldda_ids and str( ldda.id ) in created_ldda_ids
+ if ldda:
+ # There should always be an ldda, but some users running their own instances have reported that
+ # some of their LibraryDatasets have no associated lddas
+ selected = created_ldda_ids and str( ldda.id ) in created_ldda_ids
%>
- ${render_dataset( cntrller, ldda, library_dataset, selected, library, folder, pad, my_row, row_counter, tracked_datasets, show_deleted=show_deleted )}
+ %if ldda:
+ ${render_dataset( cntrller, ldda, library_dataset, selected, library, folder, pad, my_row, row_counter, tracked_datasets, show_deleted=show_deleted )}
+ %endif
%endfor
%else:
%for sub_folder in sub_folders:
@@ -449,8 +454,13 @@
%for library_dataset in library_datasets:
<%
ldda = library_dataset.library_dataset_dataset_association
- can_access = trans.app.security_agent.can_access_dataset( current_user_roles, ldda.dataset )
- selected = created_ldda_ids and str( ldda.id ) in created_ldda_ids
+ if ldda:
+ # There should always be an ldda, but some users running their own instances have reported that
+ # some of their LibraryDatasets have no associated lddas
+ can_access = trans.app.security_agent.can_access_dataset( current_user_roles, ldda.dataset )
+ selected = created_ldda_ids and str( ldda.id ) in created_ldda_ids
+ else:
+ can_access = False
%>
%if can_access:
${render_dataset( cntrller, ldda, library_dataset, selected, library, folder, pad, my_row, row_counter, tracked_datasets, show_deleted=show_deleted )}
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 changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/93b1bbecbed8/
changeset: r5066:93b1bbecbed8
user: dan
date: 2011-02-15 23:24:24
summary: Add a Line/Word/Character count Text Manipulation tool.
affected #: 4 files (39 bytes)
--- a/tool_conf.xml.sample Tue Feb 15 16:52:16 2011 -0500
+++ b/tool_conf.xml.sample Tue Feb 15 17:24:24 2011 -0500
@@ -55,6 +55,7 @@
<tool file="filters/headWrapper.xml" /><tool file="filters/tailWrapper.xml" /><tool file="filters/trimmer.xml" />
+ <tool file="filters/wc_gnu.xml" /><tool file="stats/dna_filtering.xml" /><tool file="new_operations/tables_arithmetic_operations.xml" /></section>
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.