Skip to content
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

Rebuild pasta #12648

Merged
merged 9 commits into from
Dec 14, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions build-fail-blacklist
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

# The build string needs to be modified to account for the [nocairo] feature
recipes/genometools-genometools/1.5.10-nocairo

Expand Down Expand Up @@ -315,10 +316,6 @@ recipes/poretools/0.5.1
# RuntimeError: Setuptools downloading is disabled in conda build. Be sure to add all dependencies in the meta.yaml url=https://pypi.org/simple/pyaml/#
recipes/hubward

# RuntimeError: Setuptools downloading is disabled in conda build. Be sure to add all dependencies in the meta.yaml url=https://files.pythonhosted.org/packages/source/c/certifi/certifi-2016.9.26.tar.gz#md5=baa81e951a29958563689d868ef1064d
recipes/pasta/1.7.8
recipes/pasta/0.2

#failed to get install actions, retrying. exception was: The following specifications were found to be in conflict:
# - numpy=1.9
# - qiime -> numpy=1.12
Expand Down
56 changes: 0 additions & 56 deletions recipes/pasta/0.2/build.sh

This file was deleted.

60 changes: 0 additions & 60 deletions recipes/pasta/0.2/meta.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions recipes/pasta/1.7.8/build.sh → recipes/pasta/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ then
tar -xzf a3e6f56.tar.gz
mv sate-tools-linux-a3e6f56372599ffacf1bd43adb2d67cf361228e2 sate-tools-linux
cd pasta
$PYTHON setup.py install
$PYTHON setup.py install --single-version-externally-managed --record=/tmp/record.txt
mkdir $install_dir/sate-tools-linux
cp -R $work_dir/sate-tools-linux/* $install_dir/sate-tools-linux/
# Handle a PASTA bug.
Expand All @@ -33,7 +33,7 @@ then
tar -xzf 0712214.tar.gz
mv sate-tools-mac-0712214e20152b2ec989fc102602afa53d3a7b1a sate-tools-mac
cd pasta
$PYTHON setup.py install
$PYTHON setup.py install --single-version-externally-managed --record=/tmp/record.txt
mkdir $install_dir/sate-tools-mac
cp -R $work_dir/sate-tools-mac/* $install_dir/sate-tools-mac/
# Handle a PASTA bug.
Expand Down
13 changes: 7 additions & 6 deletions recipes/pasta/1.7.8/meta.yaml → recipes/pasta/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,29 @@ package:

source:
url: https://github.com/smirarab/pasta/archive/43076b8.tar.gz
md5: a085bb4f6b4116566a61b785be580ae1
sha256: 5eecec1710790df642696d1a52ecf723e5f02dd94e971427117344342a7c2a42

build:
number: 2

requirements:
build:
- {{ compiler('c') }}

host:
- certifi
- python
- setuptools
- dendropy >=4.1.0
- gnu-wget
- java-jdk >=6
- openjdk
- pcre
- python
- pymongo >=3.3.0

run:
- python
- dendropy >=4.1.0
- java-jdk >=6
- openjdk
- pcre
- python
- pymongo >=3.3.0

test:
Expand Down