annotate tool_dependencies.xml @ 62:b90441d0fe7d

Undo including $ENV[PYTHONPATH] in PYTHONPATH If $ENV[PYTHONPATH] is empty, Galaxy replaces it with $PYTHONPATH instead of an empty string, which introduces python 2 code in the python 3 path.
author Jan Kanis <jan.code@jankanis.nl>
date Wed, 28 May 2014 14:02:38 +0200
parents cd31e2fb5f22
children fb823a59918f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
41
637f96ffb9a4 more dependency updates, now including the python package dependencies
Jan Kanis <jan.code@jankanis.nl>
parents:
diff changeset
1 <?xml version="1.0"?>
637f96ffb9a4 more dependency updates, now including the python package dependencies
Jan Kanis <jan.code@jankanis.nl>
parents:
diff changeset
2 <tool_dependency>
46
518580263e96 change tool_dependencies.xml
Jan Kanis <jan.code@jankanis.nl>
parents: 45
diff changeset
3 <package name="libxml2" version="2.9.1">
48
49de6a204554 fix prior_installation_required flag
Jan Kanis <jan.code@jankanis.nl>
parents: 47
diff changeset
4 <repository name="package_libxml2_2_9_1" owner="devteam" prior_installation_required="True"
46
518580263e96 change tool_dependencies.xml
Jan Kanis <jan.code@jankanis.nl>
parents: 45
diff changeset
5 toolshed="http://toolshed.g2.bx.psu.edu" changeset_revision="3af7ad13a6fb" />
518580263e96 change tool_dependencies.xml
Jan Kanis <jan.code@jankanis.nl>
parents: 45
diff changeset
6 </package>
518580263e96 change tool_dependencies.xml
Jan Kanis <jan.code@jankanis.nl>
parents: 45
diff changeset
7
518580263e96 change tool_dependencies.xml
Jan Kanis <jan.code@jankanis.nl>
parents: 45
diff changeset
8 <package name="libxslt" version="1.1.28">
48
49de6a204554 fix prior_installation_required flag
Jan Kanis <jan.code@jankanis.nl>
parents: 47
diff changeset
9 <repository name="package_libxslt_1_1_28" owner="devteam" prior_installation_required="True"
46
518580263e96 change tool_dependencies.xml
Jan Kanis <jan.code@jankanis.nl>
parents: 45
diff changeset
10 toolshed="http://toolshed.g2.bx.psu.edu" changeset_revision="039b04adcfee" />
518580263e96 change tool_dependencies.xml
Jan Kanis <jan.code@jankanis.nl>
parents: 45
diff changeset
11 </package>
518580263e96 change tool_dependencies.xml
Jan Kanis <jan.code@jankanis.nl>
parents: 45
diff changeset
12
53
4217bb9cf1d3 depend on python 3; fix internal links with multiple iterations
Jan Kanis <jan.code@jankanis.nl>
parents: 51
diff changeset
13 <package name="python3" version="3.4.1">
4217bb9cf1d3 depend on python 3; fix internal links with multiple iterations
Jan Kanis <jan.code@jankanis.nl>
parents: 51
diff changeset
14 <repository name="package_python3_4" owner="jankanis" prior_installation_required="True"
60
cd31e2fb5f22 depend on latest python3, add $ENV[PYTHONPATH] to PYTHONPATH
Jan Kanis <jan.code@jankanis.nl>
parents: 58
diff changeset
15 toolshed="http://toolshed.g2.bx.psu.edu" changeset_revision="7719329e5b98" />
41
637f96ffb9a4 more dependency updates, now including the python package dependencies
Jan Kanis <jan.code@jankanis.nl>
parents:
diff changeset
16 </package>
53
4217bb9cf1d3 depend on python 3; fix internal links with multiple iterations
Jan Kanis <jan.code@jankanis.nl>
parents: 51
diff changeset
17
4217bb9cf1d3 depend on python 3; fix internal links with multiple iterations
Jan Kanis <jan.code@jankanis.nl>
parents: 51
diff changeset
18 <package name="blast2html_venv" version="0.1">
41
637f96ffb9a4 more dependency updates, now including the python package dependencies
Jan Kanis <jan.code@jankanis.nl>
parents:
diff changeset
19 <install version="1.0">
637f96ffb9a4 more dependency updates, now including the python package dependencies
Jan Kanis <jan.code@jankanis.nl>
parents:
diff changeset
20 <actions>
46
518580263e96 change tool_dependencies.xml
Jan Kanis <jan.code@jankanis.nl>
parents: 45
diff changeset
21 <action type="set_environment_for_install">
48
49de6a204554 fix prior_installation_required flag
Jan Kanis <jan.code@jankanis.nl>
parents: 47
diff changeset
22 <repository name="package_libxml2_2_9_1" owner="devteam"
46
518580263e96 change tool_dependencies.xml
Jan Kanis <jan.code@jankanis.nl>
parents: 45
diff changeset
23 toolshed="http://toolshed.g2.bx.psu.edu" changeset_revision="3af7ad13a6fb">
518580263e96 change tool_dependencies.xml
Jan Kanis <jan.code@jankanis.nl>
parents: 45
diff changeset
24 <package name="libxml2" version="2.9.1" />
518580263e96 change tool_dependencies.xml
Jan Kanis <jan.code@jankanis.nl>
parents: 45
diff changeset
25 </repository>
48
49de6a204554 fix prior_installation_required flag
Jan Kanis <jan.code@jankanis.nl>
parents: 47
diff changeset
26 <repository name="package_libxslt_1_1_28" owner="devteam"
46
518580263e96 change tool_dependencies.xml
Jan Kanis <jan.code@jankanis.nl>
parents: 45
diff changeset
27 toolshed="http://toolshed.g2.bx.psu.edu" changeset_revision="039b04adcfee">
518580263e96 change tool_dependencies.xml
Jan Kanis <jan.code@jankanis.nl>
parents: 45
diff changeset
28 <package name="libxslt" version="1.1.28" />
518580263e96 change tool_dependencies.xml
Jan Kanis <jan.code@jankanis.nl>
parents: 45
diff changeset
29 </repository>
55
c0c4f52ca313 fix depended repository name
Jan Kanis <jan.code@jankanis.nl>
parents: 54
diff changeset
30 <repository name="package_python3_4" owner="jankanis"
60
cd31e2fb5f22 depend on latest python3, add $ENV[PYTHONPATH] to PYTHONPATH
Jan Kanis <jan.code@jankanis.nl>
parents: 58
diff changeset
31 toolshed="http://toolshed.g2.bx.psu.edu" changeset_revision="7719329e5b98">
53
4217bb9cf1d3 depend on python 3; fix internal links with multiple iterations
Jan Kanis <jan.code@jankanis.nl>
parents: 51
diff changeset
32 <package name="python3" version="3.4.1" />
4217bb9cf1d3 depend on python 3; fix internal links with multiple iterations
Jan Kanis <jan.code@jankanis.nl>
parents: 51
diff changeset
33 </repository>
46
518580263e96 change tool_dependencies.xml
Jan Kanis <jan.code@jankanis.nl>
parents: 45
diff changeset
34 </action>
53
4217bb9cf1d3 depend on python 3; fix internal links with multiple iterations
Jan Kanis <jan.code@jankanis.nl>
parents: 51
diff changeset
35
4217bb9cf1d3 depend on python 3; fix internal links with multiple iterations
Jan Kanis <jan.code@jankanis.nl>
parents: 51
diff changeset
36 <action type="shell_command">
4217bb9cf1d3 depend on python 3; fix internal links with multiple iterations
Jan Kanis <jan.code@jankanis.nl>
parents: 51
diff changeset
37 # Unset any saved environment settings from parent virtual
4217bb9cf1d3 depend on python 3; fix internal links with multiple iterations
Jan Kanis <jan.code@jankanis.nl>
parents: 51
diff changeset
38 # environments, e.g. for python 2 or if Galaxy itself is running
4217bb9cf1d3 depend on python 3; fix internal links with multiple iterations
Jan Kanis <jan.code@jankanis.nl>
parents: 51
diff changeset
39 # from within a virtual environment.
4217bb9cf1d3 depend on python 3; fix internal links with multiple iterations
Jan Kanis <jan.code@jankanis.nl>
parents: 51
diff changeset
40 unset _OLD_VIRTUAL_PATH; unset _OLD_VIRTUAL_PYTHONHOME
4217bb9cf1d3 depend on python 3; fix internal links with multiple iterations
Jan Kanis <jan.code@jankanis.nl>
parents: 51
diff changeset
41 pyvenv blast2html_venv
58
39df29f647e8 set other environment variables as well
Jan Kanis <jan.code@jankanis.nl>
parents: 57
diff changeset
42 blast2html_venv/bin/pip3 install lxml jinja2
53
4217bb9cf1d3 depend on python 3; fix internal links with multiple iterations
Jan Kanis <jan.code@jankanis.nl>
parents: 51
diff changeset
43 </action>
4217bb9cf1d3 depend on python 3; fix internal links with multiple iterations
Jan Kanis <jan.code@jankanis.nl>
parents: 51
diff changeset
44
4217bb9cf1d3 depend on python 3; fix internal links with multiple iterations
Jan Kanis <jan.code@jankanis.nl>
parents: 51
diff changeset
45 <action type="set_environment">
58
39df29f647e8 set other environment variables as well
Jan Kanis <jan.code@jankanis.nl>
parents: 57
diff changeset
46 <!-- Remove any incoming PYTHONPATH elements from Galaxy's own environment -->
62
b90441d0fe7d Undo including $ENV[PYTHONPATH] in PYTHONPATH
Jan Kanis <jan.code@jankanis.nl>
parents: 60
diff changeset
47 <environment_variable name="PYTHONPATH" action="set_to">$INSTALL_DIR/blast2html_venv/lib/python3.4/site-packages</environment_variable>
58
39df29f647e8 set other environment variables as well
Jan Kanis <jan.code@jankanis.nl>
parents: 57
diff changeset
48 <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/blast2html_venv/bin</environment_variable>
39df29f647e8 set other environment variables as well
Jan Kanis <jan.code@jankanis.nl>
parents: 57
diff changeset
49 <environment_variable name="PYTHONHOME" action="set_to"></environment_variable>
39df29f647e8 set other environment variables as well
Jan Kanis <jan.code@jankanis.nl>
parents: 57
diff changeset
50 <!-- To find shared libraries such as libssl or libxml2 -->
57
159989f6bfa6 depend on new python3; set LD_LIBRARY_PATH
Jan Kanis <jan.code@jankanis.nl>
parents: 55
diff changeset
51 <environment_variable name="LD_LIBRARY_PATH" action="prepend_to">$ENV[LD_LIBRARY_PATH]</environment_variable>
46
518580263e96 change tool_dependencies.xml
Jan Kanis <jan.code@jankanis.nl>
parents: 45
diff changeset
52 </action>
41
637f96ffb9a4 more dependency updates, now including the python package dependencies
Jan Kanis <jan.code@jankanis.nl>
parents:
diff changeset
53 </actions>
637f96ffb9a4 more dependency updates, now including the python package dependencies
Jan Kanis <jan.code@jankanis.nl>
parents:
diff changeset
54 </install>
53
4217bb9cf1d3 depend on python 3; fix internal links with multiple iterations
Jan Kanis <jan.code@jankanis.nl>
parents: 51
diff changeset
55 <readme>A Python 3 virtual environment that includes the python packages blast2html depends on, which are lxml and jinja2.</readme>
41
637f96ffb9a4 more dependency updates, now including the python package dependencies
Jan Kanis <jan.code@jankanis.nl>
parents:
diff changeset
56 </package>
637f96ffb9a4 more dependency updates, now including the python package dependencies
Jan Kanis <jan.code@jankanis.nl>
parents:
diff changeset
57
637f96ffb9a4 more dependency updates, now including the python package dependencies
Jan Kanis <jan.code@jankanis.nl>
parents:
diff changeset
58 </tool_dependency>