2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/8b6e1ffaa053/
Changeset: 8b6e1ffaa053
Branch: next-stable
User: dannon
Date: 2014-06-02 19:16:15
Summary: Fix for when check_binary fails against an actual binary datatype. The logic in upload needs to be revisited per the comments.
Affected #: 1 file
diff -r f11149134d6dfafcaf7245f543381e60a937578b -r 8b6e1ffaa053f87c944290f3a84e5f73633cd901 tools/data_source/upload.py
--- a/tools/data_source/upload.py
+++ b/tools/data_source/upload.py
@@ -241,7 +241,11 @@
dataset.name = uncompressed_name
data_type = 'zip'
if not data_type:
- if check_binary( dataset.path ):
+ # TODO refactor this logic. check_binary isn't guaranteed to be
+ # correct since it only looks at whether the first 100 chars are
+ # printable or not. If someone specifies a known unsniffable
+ # binary datatype and check_binary fails, the file gets mangled.
+ if check_binary( dataset.path ) or Binary.is_ext_unsniffable(dataset.file_type):
# We have a binary dataset, but it is not Bam, Sff or Pdf
data_type = 'binary'
#binary_ok = False
https://bitbucket.org/galaxy/galaxy-central/commits/5273e0bf9ae5/
Changeset: 5273e0bf9ae5
User: dannon
Date: 2014-06-02 19:16:51
Summary: merge next-stable
Affected #: 1 file
diff -r 15d426f19dcccb5ee3c06158898f1102c62d365d -r 5273e0bf9ae54599f1dadbce9d943dcac828d0f0 tools/data_source/upload.py
--- a/tools/data_source/upload.py
+++ b/tools/data_source/upload.py
@@ -241,7 +241,11 @@
dataset.name = uncompressed_name
data_type = 'zip'
if not data_type:
- if check_binary( dataset.path ):
+ # TODO refactor this logic. check_binary isn't guaranteed to be
+ # correct since it only looks at whether the first 100 chars are
+ # printable or not. If someone specifies a known unsniffable
+ # binary datatype and check_binary fails, the file gets mangled.
+ if check_binary( dataset.path ) or Binary.is_ext_unsniffable(dataset.file_type):
# We have a binary dataset, but it is not Bam, Sff or Pdf
data_type = 'binary'
#binary_ok = False
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/15d426f19dcc/
Changeset: 15d426f19dcc
User: dan
Date: 2014-06-02 18:30:46
Summary: merge next-stable
Affected #: 1 file
diff -r 3b85bc04f24fd4970bc6376a425decb7daf8c03f -r 15d426f19dcccb5ee3c06158898f1102c62d365d templates/grid_base.mako
--- a/templates/grid_base.mako
+++ b/templates/grid_base.mako
@@ -54,7 +54,7 @@
${h.js("libs/jquery/jquery.autocomplete", "galaxy.autocom_tagging", "libs/jquery/jquery.rating" )}
## grid container
- <div id="grid-container"><div>
+ <div id="grid-container"></div>
## load javascript
<script type="text/javascript">
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/f11149134d6d/
Changeset: f11149134d6d
Branch: next-stable
User: dan
Date: 2014-06-02 18:30:10
Summary: Close grid-container.
Affected #: 1 file
diff -r 66c38fea170f5dac9fe8fb8296077e400391b28a -r f11149134d6dfafcaf7245f543381e60a937578b templates/grid_base.mako
--- a/templates/grid_base.mako
+++ b/templates/grid_base.mako
@@ -54,7 +54,7 @@
${h.js("libs/jquery/jquery.autocomplete", "galaxy.autocom_tagging", "libs/jquery/jquery.rating" )}
## grid container
- <div id="grid-container"><div>
+ <div id="grid-container"></div>
## load javascript
<script type="text/javascript">
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/3b85bc04f24f/
Changeset: 3b85bc04f24f
User: dannon
Date: 2014-06-02 18:27:01
Summary: Merge.
Affected #: 1 file
diff -r 8caa7f4d72c7abe021ce5312bda46a3118ff68d8 -r 3b85bc04f24fd4970bc6376a425decb7daf8c03f templates/user/openid_manage.mako
--- a/templates/user/openid_manage.mako
+++ b/templates/user/openid_manage.mako
@@ -4,7 +4,8 @@
<%namespace file="login.mako" import="render_openid_form" /><%def name="load()">
- ${parent.load()}
<h2>Associate more OpenIDs</h2>
${render_openid_form( kwargs['redirect'], True, kwargs['openid_providers'] )}
-</%def>
\ No newline at end of file
+ <br/><br/>
+ ${parent.load()}
+</%def>
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/66c38fea170f/
Changeset: 66c38fea170f
Branch: next-stable
User: dannon
Date: 2014-06-02 18:26:12
Summary: Fix OpenID to work post grid refactoring.
Affected #: 1 file
diff -r 5db75eaf06614909c09a6bbd70fe6f18007a39a8 -r 66c38fea170f5dac9fe8fb8296077e400391b28a templates/user/openid_manage.mako
--- a/templates/user/openid_manage.mako
+++ b/templates/user/openid_manage.mako
@@ -4,7 +4,8 @@
<%namespace file="login.mako" import="render_openid_form" /><%def name="load()">
- ${parent.load()}
<h2>Associate more OpenIDs</h2>
${render_openid_form( kwargs['redirect'], True, kwargs['openid_providers'] )}
-</%def>
\ No newline at end of file
+ <br/><br/>
+ ${parent.load()}
+</%def>
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/db4083ef9b77/
Changeset: db4083ef9b77
User: davebgx
Date: 2014-06-02 16:27:58
Summary: Add ucsc_build_sites.txt.sample to setup_buildbot.sh
Affected #: 1 file
diff -r 667ba7198f66c0ae9ae0eadbb9ce569a1af05199 -r db4083ef9b77ee8896a164c0120fc16914c6f8d5 buildbot_setup.sh
--- a/buildbot_setup.sh
+++ b/buildbot_setup.sh
@@ -58,6 +58,7 @@
tool-data/shared/rviewer/rviewer_build_sites.txt.sample
tool-data/shared/ucsc/builds.txt.sample
tool-data/shared/ucsc/publicbuilds.txt.sample
+tool-data/shared/ucsc/ucsc_build_sites.txt.sample
"
DIRS="
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.