1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/9de21817a7a5/
changeset: 9de21817a7a5
user: dan
date: 2011-08-22 20:03:57
summary: pdate EuPathDB datasource configuration file. Contributed by Mark Heiges.
affected #: 1 file (4 bytes)
--- a/tools/data_source/eupathdb.xml Mon Aug 22 10:45:22 2011 -0400
+++ b/tools/data_source/eupathdb.xml Mon Aug 22 14:03:57 2011 -0400
@@ -7,7 +7,7 @@
</inputs><uihints minwidth="800"/><outputs>
- <data name="output" format="txt" />
+ <data name="output" format="tabular" /></outputs><options sanitize="False" refresh="True"/></tool>
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/0f878ea61e98/
changeset: 0f878ea61e98
user: natefoo
date: 2011-08-22 16:45:22
summary: Add helper.py (posted to the -dev list as "galaxythinger.py" in the past), a command line tool for performing a couple common operations like encoding/decoding IDs and getting the disk path of HDAs.
affected #: 1 file (0 bytes)
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/fa7159dcb42e/
changeset: fa7159dcb42e
user: kanwei
date: 2011-08-20 08:56:33
summary: Spacing fix
affected #: 2 files (0 bytes)
--- a/lib/galaxy/web/form_builder.py Sat Aug 20 14:27:30 2011 +1000
+++ b/lib/galaxy/web/form_builder.py Sat Aug 20 02:56:33 2011 -0400
@@ -191,9 +191,9 @@
def get_html( self, prefix="" ):
rval = FTPFileField.thead
if self.dir is None:
- rval += '<tr><td colspan="3"><em>Please <a href="%s">create</a> or <a href="%s">log in to</a> a Galaxy account to view files uploaded via FTP.</em></td></tr>' % ( url_for( controller='user', action='create', cntrller='user', referer=url_for( controller='root' ) ), url_for( controller='user', action='login', cntrller='user', referer=url_for( controller='root' ) ) )
+ rval += '<tr><td colspan="4"><em>Please <a href="%s">create</a> or <a href="%s">log in to</a> a Galaxy account to view files uploaded via FTP.</em></td></tr>' % ( url_for( controller='user', action='create', cntrller='user', referer=url_for( controller='root' ) ), url_for( controller='user', action='login', cntrller='user', referer=url_for( controller='root' ) ) )
elif not os.path.exists( self.dir ):
- rval += '<tr><td colspan="3"><em>Your FTP upload directory contains no files.</em></td></tr>'
+ rval += '<tr><td colspan="4"><em>Your FTP upload directory contains no files.</em></td></tr>'
else:
uploads = []
for ( dirpath, dirnames, filenames ) in os.walk( self.dir ):
@@ -204,7 +204,7 @@
size=nice_size( statinfo.st_size ),
ctime=time.strftime( "%m/%d/%Y %I:%M:%S %p", time.localtime( statinfo.st_ctime ) ) ) )
if not uploads:
- rval += '<tr><td colspan="3"><em>Your FTP upload directory contains no files.</em></td></tr>'
+ rval += '<tr><td colspan="4"><em>Your FTP upload directory contains no files.</em></td></tr>'
for upload in uploads:
rval += FTPFileField.trow % ( prefix, self.name, upload['path'], upload['path'], upload['size'], upload['ctime'] )
rval += FTPFileField.tfoot
--- a/tools/data_source/upload.xml Sat Aug 20 14:27:30 2011 +1000
+++ b/tools/data_source/upload.xml Sat Aug 20 02:56:33 2011 -0400
@@ -177,7 +177,7 @@
**MAF**
-TBA and multiz multiple alignment format. The first line of a .maf file begins with ##maf. This word is followed by white-space-separated "variable=value pairs". There should be no white space surrounding the "=".
+TBA and multiz multiple alignment format. The first line of a .maf file begins with ##maf. This word is followed by white-space-separated "variable=value" pairs. There should be no white space surrounding the "=".
-----
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/a9b3f9b82e84/
changeset: a9b3f9b82e84
user: fubar
date: 2011-08-20 06:27:30
summary: WebLogo3 wrapper repair to a string format edge case. Reports are good for finding these - user hadn't reported...
affected #: 1 file (7 bytes)
--- a/tools/rgenetics/rgWebLogo3.py Fri Aug 19 14:37:51 2011 -0400
+++ b/tools/rgenetics/rgWebLogo3.py Sat Aug 20 14:27:30 2011 +1000
@@ -43,11 +43,6 @@
tlf = open(templog,'w')
process = subprocess.Popen(cl, shell=True, stderr=tlf, stdout=tlf)
rval = process.wait()
- if rval <> 0:
- print >> sys.stderr, '## rgWebLogo3.py error - executing %s returned error code %d' % cl
- print >> sys.stderr, '## This may be a data problem or a tool dependency (%s) installation problem' % WEBLOGO
- print >> sys.stderr, '## Please ensure %s is correctly installed and working on the command line -see http://code.google.com/p/weblogo' % WEBLOGO
- sys.exit(1)
tlf.close()
tlogs = ''.join(open(templog,'r').readlines())
if len(tlogs) > 1:
@@ -55,6 +50,11 @@
else:
s = '## executing %s returned status %d. Nothing appeared on stderr/stdout\n' % (cl,rval)
os.unlink(templog) # always
+ if rval <> 0:
+ print >> sys.stderr, '## rgWebLogo3.py error - executing %s returned error code %d' % (cl,rval)
+ print >> sys.stderr, '## This may be a data problem or a tool dependency (%s) installation problem' % WEBLOGO
+ print >> sys.stderr, '## Please ensure %s is correctly installed and working on the command line -see http://code.google.com/p/weblogo' % WEBLOGO
+ sys.exit(1)
return s
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/c4a82d645370/
changeset: c4a82d645370
user: jgoecks
date: 2011-08-18 20:20:48
summary: Add wrapper for Trinity, the de novo RNA-seq transcript assembler (http://http://trinityrnaseq.sourceforge.net/).
affected #: 2 files (105 bytes)
--- a/tool_conf.xml.sample Thu Aug 18 14:01:28 2011 -0400
+++ b/tool_conf.xml.sample Thu Aug 18 14:20:48 2011 -0400
@@ -335,6 +335,8 @@
<tool file="ngs_rna/cufflinks_wrapper.xml" /><tool file="ngs_rna/cuffcompare_wrapper.xml" /><tool file="ngs_rna/cuffdiff_wrapper.xml" />
+ <label text="De novo Assembly" id="de_novo_assembly "/>
+ <tool file="ngs_rna/trinity_all.xml" /><label text="Filtering" id="filtering" /><tool file="ngs_rna/filter_transcripts_via_tracking.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.
1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/59beb8e9290d/
changeset: 59beb8e9290d
user: natefoo
date: 2011-08-18 20:01:28
summary: Quota display nice_size bugfixes.
affected #: 1 file (72 bytes)
--- a/lib/galaxy/quota/__init__.py Thu Aug 18 13:51:02 2011 -0400
+++ b/lib/galaxy/quota/__init__.py Thu Aug 18 14:01:28 2011 -0400
@@ -60,11 +60,13 @@
use_default = True
max = 0
adjustment = 0
+ rval = 0
for quota in quotas:
if quota.deleted:
continue
if quota.operation == '=' and quota.bytes == -1:
- return None
+ rval = None
+ break
elif quota.operation == '=':
use_default = False
if quota.bytes > max:
@@ -76,16 +78,17 @@
if use_default:
max = self.default_registered_quota
if max is None:
- return None
- quota = max + adjustment
- if quota <= 0:
- quota = 0
+ rval = None
+ if rval is not None:
+ rval = max + adjustment
+ if rval <= 0:
+ rval = 0
if nice_size:
- if quota is not None:
- quota = util.nice_size( quota )
+ if rval is not None:
+ rval = util.nice_size( rval )
else:
- quota = 'unlimited'
- return quota
+ rval = 'unlimited'
+ return rval
@property
def default_unregistered_quota( self ):
return self._default_quota( self.model.DefaultQuotaAssociation.types.UNREGISTERED )
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/5710c02b60ca/
changeset: 5710c02b60ca
user: natefoo
date: 2011-08-18 19:13:35
summary: Don't count library datasets against the creating user upon dataset creation.
affected #: 1 file (30 bytes)
--- a/lib/galaxy/jobs/__init__.py Thu Aug 18 13:08:39 2011 -0400
+++ b/lib/galaxy/jobs/__init__.py Thu Aug 18 13:13:35 2011 -0400
@@ -681,7 +681,7 @@
bytes = 0
# Once datasets are collected, set the total dataset size (includes extra files)
- for dataset_assoc in job.output_datasets + job.output_library_datasets:
+ for dataset_assoc in job.output_datasets:
dataset_assoc.dataset.dataset.set_total_size()
bytes += dataset_assoc.dataset.dataset.get_total_size()
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/3c87cb241165/
changeset: 3c87cb241165
user: natefoo
date: 2011-08-18 19:08:39
summary: Decrease disk usage and actually remove datasets (if applicable) when purging a history.
affected #: 1 file (167 bytes)
--- a/lib/galaxy/web/controllers/history.py Thu Aug 18 11:08:47 2011 -0400
+++ b/lib/galaxy/web/controllers/history.py Thu Aug 18 13:08:39 2011 -0400
@@ -271,9 +271,12 @@
n_deleted += 1
if purge and trans.app.config.allow_user_dataset_purge:
for hda in history.datasets:
+ if trans.user:
+ trans.user.total_disk_usage -= hda.quota_amount( trans.user )
hda.purged = True
trans.sa_session.add( hda )
trans.log_event( "HDA id %s has been purged" % hda.id )
+ trans.sa_session.flush()
if hda.dataset.user_can_purge:
try:
hda.dataset.full_delete()
@@ -1207,4 +1210,4 @@
def get_item( self, trans, id ):
return self.get_history( trans, id )
-
\ No newline at end of file
+
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.