1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/863e1150c85b/
changeset: 863e1150c85b
user: jgoecks
date: 2012-08-22 20:42:05
summary: Add data placeholders so that BED files without all optional fields can be dynamically filtered.
affected #: 1 file
diff -r 931382e567f501ff8529cdd3c7b45c2d08d0ab23 -r 863e1150c85b7383a1b136c9b3c9376da81bc16b lib/galaxy/visualization/tracks/data_providers.py
--- a/lib/galaxy/visualization/tracks/data_providers.py
+++ b/lib/galaxy/visualization/tracks/data_providers.py
@@ -484,6 +484,11 @@
# Score (filter data)
if length >= 5 and filter_cols and filter_cols[0] == "Score":
+ # If dataset doesn't have name/strand/thick start/thick end/blocks,
+ # add placeholders. There should be 8 entries if all attributes
+ # are present.
+ payload.extend( [ None for i in range( 8 - len( payload ) ) ] )
+
try:
payload.append( float( feature[4] ) )
except:
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/changeset/7eeee803345e/
changeset: 7eeee803345e
user: dan
date: 2012-08-22 17:40:55
summary: Better handling of invalid dynamic external display application links.
affected #: 1 file
diff -r 9df126526d89979a7830bc48c7bff122555eaea9 -r 7eeee803345e111b9485cc9b9c2b397a6623fa5f lib/galaxy/datatypes/display_applications/application.py
--- a/lib/galaxy/datatypes/display_applications/application.py
+++ b/lib/galaxy/datatypes/display_applications/application.py
@@ -98,8 +98,10 @@
for line in open( filename ):
if not skip_startswith or not line.startswith( skip_startswith ):
line = line.rstrip( '\n\r' )
+ if not line:
+ continue
fields = line.split( separator )
- if len( fields ) >= max_col:
+ if len( fields ) > max_col:
new_elem = deepcopy( elem )
new_elem.set( 'id', fields[id_col] )
new_elem.set( 'name', fields[name_col] )
@@ -111,6 +113,8 @@
dynamic_values[key] = value
#now populate
rval.append( DisplayApplicationLink.from_elem( new_elem, display_application, other_values = dynamic_values ) )
+ else:
+ log.warning( 'Invalid dynamic display application link specified in %s: "%s"' % ( filename, line ) )
self.links = rval
def __iter__( self ):
return iter( self.links )
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/changeset/9df126526d89/
changeset: 9df126526d89
user: afgane
date: 2012-08-22 08:24:52
summary: Rename an ObjectStore method not to be AWS-specific
affected #: 1 file
diff -r 8c07fc133839d1c175aa85d37d43f2f9ce5c6182 -r 9df126526d89979a7830bc48c7bff122555eaea9 lib/galaxy/objectstore/__init__.py
--- a/lib/galaxy/objectstore/__init__.py
+++ b/lib/galaxy/objectstore/__init__.py
@@ -608,13 +608,13 @@
log.error("Problem downloading key '%s' from S3 bucket '%s': %s" % (rel_path, self.bucket.name, ex))
return False
- def _push_to_s3(self, rel_path, source_file=None, from_string=None):
+ def _push_to_os(self, rel_path, source_file=None, from_string=None):
"""
- Push the file pointed to by `rel_path` to S3 naming the key `rel_path`.
- If `source_file` is provided, push that file instead while still using
- `rel_path` as the key name.
- If `from_string` is provided, set contents of the file to the value of
- the string
+ Push the file pointed to by ``rel_path`` to the object store naming the key
+ ``rel_path``. If ``source_file`` is provided, push that file instead while
+ still using ``rel_path`` as the key name.
+ If ``from_string`` is provided, set contents of the file to the value of
+ the string.
"""
try:
source_file = source_file if source_file else self._get_cache_path(rel_path)
@@ -680,7 +680,7 @@
return False
# TODO: Sync should probably not be done here. Add this to an async upload stack?
if in_cache and not in_s3:
- self._push_to_s3(rel_path, source_file=self._get_cache_path(rel_path))
+ self._push_to_os(rel_path, source_file=self._get_cache_path(rel_path))
return True
elif in_s3:
return True
@@ -713,12 +713,12 @@
# flat namespace), do so for consistency with the regular file system
# S3 folders are marked by having trailing '/' so add it now
# s3_dir = '%s/' % rel_path
- # self._push_to_s3(s3_dir, from_string='')
+ # self._push_to_os(s3_dir, from_string='')
# If instructed, create the dataset in cache & in S3
if not dir_only:
rel_path = os.path.join(rel_path, alt_name if alt_name else "dataset_%s.dat" % obj.id)
open(os.path.join(self.staging_path, rel_path), 'w').close()
- self._push_to_s3(rel_path, from_string='')
+ self._push_to_os(rel_path, from_string='')
def empty(self, obj, **kwargs):
if self.exists(obj, **kwargs):
@@ -832,7 +832,7 @@
else:
source_file = self._get_cache_path(rel_path)
# Update the file on S3
- self._push_to_s3(rel_path, source_file)
+ self._push_to_os(rel_path, source_file)
else:
raise ObjectNotFound()
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.
2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/f906603c475e/
changeset: f906603c475e
user: afgane
date: 2012-08-22 08:12:46
summary: Multipart upload to OpenStack Swift does not work with boto so don't use it
affected #: 2 files
diff -r 9e9e104ad5c93a2268bb00cfae09b57a31ece13c -r f906603c475e80f9d3171c18a4051c4b325b6e5b lib/galaxy/objectstore/__init__.py
--- a/lib/galaxy/objectstore/__init__.py
+++ b/lib/galaxy/objectstore/__init__.py
@@ -631,7 +631,7 @@
# print "Pushing cache file '%s' of size %s bytes to key '%s'" % (source_file, os.path.getsize(source_file), rel_path)
# print "+ Push started at '%s'" % start_time
mb_size = os.path.getsize(source_file) / 1e6
- if mb_size < 60:
+ if mb_size < 60 or self.config.object_store == 'swift':
self.transfer_progress = 0 # Reset transfer progress counter
key.set_contents_from_filename(source_file, reduced_redundancy=self.use_rr,
cb=self._transfer_cb, num_cb=10)
@@ -649,12 +649,17 @@
return False
def file_ready(self, obj, **kwargs):
- """ A helper method that checks if a file corresponding to a dataset
- is ready and available to be used. Return True if so, False otherwise."""
+ """
+ A helper method that checks if a file corresponding to a dataset is
+ ready and available to be used. Return ``True`` if so, ``False`` otherwise.
+ """
rel_path = self._construct_path(obj, **kwargs)
# Make sure the size in cache is available in its entirety
- if self._in_cache(rel_path) and os.path.getsize(self._get_cache_path(rel_path)) == self._get_size_in_s3(rel_path):
- return True
+ if self._in_cache(rel_path):
+ if os.path.getsize(self._get_cache_path(rel_path)) == self._get_size_in_s3(rel_path):
+ return True
+ log.debug("Waiting for dataset {0} to transfer from OS: {1}/{2}".format(rel_path,
+ os.path.getsize(self._get_cache_path(rel_path)), self._get_size_in_s3(rel_path)))
return False
def exists(self, obj, **kwargs):
diff -r 9e9e104ad5c93a2268bb00cfae09b57a31ece13c -r f906603c475e80f9d3171c18a4051c4b325b6e5b templates/root/history.mako
--- a/templates/root/history.mako
+++ b/templates/root/history.mako
@@ -166,7 +166,7 @@
// $("<div/>").text("Data is loading from S3... please be patient").appendTo(link.parent());
$( '#historyItem-' + history_id).removeClass( "historyItem-ok" );
$( '#historyItem-' + history_id).addClass( "historyItem-running" );
- setTimeout(function(){check_transfer_status(link, history_id)}, 1000);
+ setTimeout(function(){check_transfer_status(link, history_id)}, 4000);
} else {
$( '#historyItem-' + history_id).removeClass( "historyItem-running" );
$( '#historyItem-' + history_id).addClass( "historyItem-ok" );
https://bitbucket.org/galaxy/galaxy-central/changeset/8c07fc133839/
changeset: 8c07fc133839
user: afgane
date: 2012-08-22 08:13:51
summary: Merge
affected #: 194 files
Diff too large to display.
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/changeset/f076e439d46e/
changeset: f076e439d46e
user: jgoecks
date: 2012-08-21 22:54:19
summary: More JS file reorganization: (a) move IE and rgenetics into their own directories; (b) move additional external libraries to libs.
affected #: 57 files
Diff too large to display.
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/changeset/6ac6c3d4b907/
changeset: 6ac6c3d4b907
user: jgoecks
date: 2012-08-21 20:27:18
summary: JavaScript cleanup: (a) create backbone lib in scripts/lib and use for backbone libraries; (b) clean up history.js; (c) pack scripts.
affected #: 19 files
Diff too large to display.
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.