-
Notifications
You must be signed in to change notification settings - Fork 3.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Restore dexseq python helper scripts #12352
Merged
lparsons
merged 5 commits into
bioconda:master
from
lparsons:dexseq_restore_python_scripts
Nov 29, 2018
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
9d7a773
Restore dexseq python helper scripts
lparsons cad646d
Add python requirement for helper scripts
lparsons 4110643
Add python noarch to build section
lparsons 7bf4680
pin it to python2k
bgruening a5221f3
Add htseq requirement, support only python <3 for now
lparsons File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,16 @@ | ||
#!/bin/bash | ||
mv DESCRIPTION DESCRIPTION.old | ||
grep -v '^Priority: ' DESCRIPTION.old > DESCRIPTION | ||
$R CMD INSTALL --build . | ||
$R CMD INSTALL --build . | ||
python_scripts=$PREFIX/lib/R/library/DEXSeq/python_scripts | ||
sed -i.bak '1s|^|#!/usr/bin/env python\'$'\n|g' $python_scripts/dexseq_count.py | ||
sed -i.bak '1s|^|#!/usr/bin/env python\'$'\n|g' $python_scripts/dexseq_prepare_annotation.py | ||
if [ "$PY3K" == 1 ]; then | ||
2to3 -w $python_scripts/dexseq_count.py | ||
2to3 -w $python_scripts/dexseq_prepare_annotation.py | ||
fi | ||
chmod +x $python_scripts/dexseq_count.py | ||
chmod +x $python_scripts/dexseq_prepare_annotation.py | ||
mkdir -p $PREFIX/bin | ||
ln -s $python_scripts/dexseq_count.py $PREFIX/bin/dexseq_count.py | ||
ln -s $python_scripts/dexseq_prepare_annotation.py $PREFIX/bin/dexseq_prepare_annotation.py |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you try:
if [ $PY3K -eq 1 ]
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tried that, and added
set -x
to the build script. Seems that$PY3K
is set to0
, and thus the2to3
commands are skipped. I'm going to try addingpython
to thehost
section of themeta.yaml
file to see if that sets$PY3K
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, that didn't work either.
$PY3K
remains set to0
. Perhaps that is broken or not the correct way to detect that we're building against Python 3? The documentation regarding build variables is a bit vague:Perhaps using
$PY_VER
is more appropriate?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Interesting...
$PY_VER
is clearly set to2.7
... Looking at the build output, it seems that python 2.7 is used during the build, but that python 3.6 is used when installed and tested. Is there a way to force these to be the same version?