1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/b9b772f2e4eb/
changeset: r5139:b9b772f2e4eb
user: natefoo
date: 2011-02-28 15:35:36
summary: Require ctypes egg before pysam on Python 2.4
affected #: 2 files (157 bytes)
--- a/lib/galaxy/datatypes/converters/bam_to_summary_tree_converter.py Mon Feb 28 08:33:48
2011 -0500
+++ b/lib/galaxy/datatypes/converters/bam_to_summary_tree_converter.py Mon Feb 28 09:35:36
2011 -0500
@@ -4,7 +4,11 @@
import sys
from galaxy import eggs
-import pkg_resources; pkg_resources.require( "pysam" )
+import pkg_resources
+
+if sys.version_info[:2] == (2, 4):
+ pkg_resources.require( "ctypes" )
+pkg_resources.require( "pysam" )
from pysam import csamtools
from galaxy.visualization.tracks.summary import *
@@ -24,4 +28,4 @@
st.write(out_fname)
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
--- a/lib/galaxy/visualization/tracks/data_providers.py Mon Feb 28 08:33:48 2011 -0500
+++ b/lib/galaxy/visualization/tracks/data_providers.py Mon Feb 28 09:35:36 2011 -0500
@@ -2,9 +2,14 @@
Data providers for tracks visualizations.
"""
+import sys
from math import floor, ceil, log, pow
import pkg_resources
-pkg_resources.require( "bx-python" ); pkg_resources.require( "pysam"
); pkg_resources.require( "numpy" )
+pkg_resources.require( "bx-python" )
+if sys.version_info[:2] == (2, 4):
+ pkg_resources.require( "ctypes" )
+pkg_resources.require( "pysam" )
+pkg_resources.require( "numpy" )
from galaxy.datatypes.util.gff_util import *
from bx.interval_index_file import Indexes
from bx.arrays.array_tree import FileArrayTreeDict
@@ -671,4 +676,4 @@
blocks = zip( block_sizes, block_starts )
payload.append( [ ( feature.start + block[1], feature.start + block[1] + block[0] )
for block in blocks ] )
- return payload
\ No newline at end of file
+ return payload
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.