Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/dereneaton/ipyrad
Browse files Browse the repository at this point in the history
  • Loading branch information
isaacovercast committed Nov 10, 2015
2 parents 87a32c5 + f96b878 commit 9d40031
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 2 deletions.
5 changes: 5 additions & 0 deletions conda.recipe/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
These are the conda build scripts. To build the conda package do this:

cd ..
conda build conda.recipe

3 changes: 2 additions & 1 deletion conda.recipe/bld.bat
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
python setup.py install
echo "ipyrad not supported on windows"
exit -1
1 change: 1 addition & 0 deletions conda.recipe/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$PYTHON setup.py install # Python command to install the script.
6 changes: 5 additions & 1 deletion conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package:
version: {{ environ['GIT_DESCRIBE_TAG'] }}

source:
git_url: ../
git_url: https://github.com/dereneaton/ipyrad.git

build:
script: python setup.py install
Expand All @@ -17,6 +17,10 @@ requirements:
- scipy
- numpy >=1.7
- h5py
- jupyter
- sphinx
- dill
- pandas
run:
- numpy >=1.7

Expand Down
3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env python2.7

from setuptools import setup, find_packages
import glob
import re

requirements = [
Expand Down Expand Up @@ -50,6 +51,8 @@
],
},

data_files = [ ( 'bin', glob.glob("./bin/*") ) ],

license='GPL',

classifiers=[
Expand Down

0 comments on commit 9d40031

Please sign in to comment.