| Previous changeset 3:7a8df77d1046 (2018-01-23) Next changeset 5:087d9872fb0d (2018-08-07) |
|
Commit message:
Uploaded version 1.0.3.1 (switch to conda dependency resolution) |
|
modified:
README.rst rnachipintegrator_canonical_genes.xml rnachipintegrator_macros.xml rnachipintegrator_wrapper.xml |
|
removed:
tool_dependencies.xml |
| b |
| diff -r 7a8df77d1046 -r b695071de766 README.rst --- a/README.rst Tue Jan 23 11:26:50 2018 -0500 +++ b/README.rst Fri Mar 09 05:07:31 2018 -0500 |
| b |
| @@ -90,6 +90,7 @@ ========== ====================================================================== Version Changes ---------- ---------------------------------------------------------------------- +1.0.3.1 - Fetch dependencies from conda if not otherwise satisfied 1.0.3.0 - Update to ``RnaChipIntegrator`` version 1.0.3 1.0.2.0 - Update to ``RnaChipIntegrator`` version 1.0.2 (fixes bug with zero or blank cutoff) |
| b |
| diff -r 7a8df77d1046 -r b695071de766 rnachipintegrator_canonical_genes.xml --- a/rnachipintegrator_canonical_genes.xml Tue Jan 23 11:26:50 2018 -0500 +++ b/rnachipintegrator_canonical_genes.xml Fri Mar 09 05:07:31 2018 -0500 |
| b |
| @@ -1,4 +1,4 @@ -<tool id="rnachipintegrator_canonical_genes" name="Analyse canonical genes against 'peak' data" version="@VERSION@.0"> +<tool id="rnachipintegrator_canonical_genes" name="Analyse canonical genes against 'peak' data" version="@VERSION@"> <description>using RnaChipIntegrator</description> <macros> <import>rnachipintegrator_macros.xml</import> |
| b |
| diff -r 7a8df77d1046 -r b695071de766 rnachipintegrator_macros.xml --- a/rnachipintegrator_macros.xml Tue Jan 23 11:26:50 2018 -0500 +++ b/rnachipintegrator_macros.xml Fri Mar 09 05:07:31 2018 -0500 |
| b |
| @@ -1,8 +1,8 @@ <macros> - <token name="@VERSION@">1.0.3</token> + <token name="@VERSION@">1.0.3.1</token> <xml name="requirements"> <requirements> - <requirement type="package" version="0.8.4">python_xlsxwriter</requirement> + <requirement type="package" version="2.7">python</requirement> <requirement type="package" version="1.0.3">rnachipintegrator</requirement> </requirements> </xml> |
| b |
| diff -r 7a8df77d1046 -r b695071de766 rnachipintegrator_wrapper.xml --- a/rnachipintegrator_wrapper.xml Tue Jan 23 11:26:50 2018 -0500 +++ b/rnachipintegrator_wrapper.xml Fri Mar 09 05:07:31 2018 -0500 |
| b |
| @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<tool id="rnachipintegrator_wrapper" name="RnaChipIntegrator" version="@VERSION@.0"> +<tool id="rnachipintegrator_wrapper" name="RnaChipIntegrator" version="@VERSION@"> <description>Integrated analysis of 'gene' and 'peak' data</description> <macros> <import>rnachipintegrator_macros.xml</import> |
| b |
| diff -r 7a8df77d1046 -r b695071de766 tool_dependencies.xml --- a/tool_dependencies.xml Tue Jan 23 11:26:50 2018 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| b |
| @@ -1,35 +0,0 @@ -<?xml version="1.0"?> -<tool_dependency> - <package name="python_xlsxwriter" version="0.8.4"> - <install version="1.0"> - <actions> - <action type="download_by_url">https://pypi.python.org/packages/source/X/XlsxWriter/XlsxWriter-0.8.4.tar.gz</action> - <action type="make_directory">$INSTALL_DIR/lib/python</action> - <action type="shell_command"> - export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python && - python setup.py install --install-lib $INSTALL_DIR/lib/python --install-scripts $INSTALL_DIR/bin - </action> - <action type="set_environment"> - <environment_variable action="prepend_to" name="PYTHONPATH">$INSTALL_DIR/lib/python</environment_variable> - <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable> - </action> - </actions> - </install> - <readme>Installs Python module XlsxWriter 0.8.4</readme> - </package> - <package name="rnachipintegrator" version="1.0.3"> - <install version="1.0"> - <actions> - <action type="download_by_url">https://pypi.python.org/packages/2f/63/d2b930e110b74197675ab6eee21f46afbdb3931f6aa971fc2de8c2437163/RnaChipIntegrator-1.0.3.tar.gz</action> - <action type="shell_command"> - pip install --no-use-wheel --install-option "--prefix=$INSTALL_DIR" . - </action> - <action type="set_environment"> - <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable> - <environment_variable action="prepend_to" name="PYTHONPATH">$INSTALL_DIR/lib/python2.7/site-packages</environment_variable> - </action> - </actions> - </install> - <readme>Installs RnaChipIntegrator 1.0.3 from PyPI</readme> - </package> -</tool_dependency> |