Skip to content

Commit 260bec9

Browse files
committed
build updates
1 parent fbf0b4c commit 260bec9

File tree

5 files changed

+8
-26
lines changed

5 files changed

+8
-26
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ os:
66

77
install:
88
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OS=MacOSX; else export OS=Linux; fi
9-
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-$OS-x86_64.sh -O miniconda.sh
9+
- wget https://repo.continuum.io/miniconda/Miniconda3-4.2.12-$OS-x86_64.sh -O miniconda.sh
1010
- bash miniconda.sh -b -p $HOME/miniconda
1111
- export PATH="$HOME/miniconda/bin:$PATH" VERSION=$(git describe --tags) MACOSX_DEPLOYMENT_TARGET=10.9
1212
- hash -r

conda/bld.bat

Lines changed: 0 additions & 8 deletions
This file was deleted.

conda/build.sh

Lines changed: 0 additions & 9 deletions
This file was deleted.

conda/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash -x
22
set -e
33
export PATH="$HOME/miniconda/bin:$PATH"
4-
anaconda -t $ANACONDA_TOKEN upload --force $HOME/miniconda/conda-bld/*/smcpp-*.tar.bz2
4+
anaconda -t $ANACONDA_TOKEN upload --force $(conda build --output conda)
55

66
# Next, build
77
constructor conda

conda/meta.tpl

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ source:
1010
requirements:
1111
build:
1212
- nomkl
13-
- python >=3.5
13+
- python 3.5.2
1414
- gcc 4.8.5
1515
- libgcc 4.8.5
1616
- gmp >=6.1
@@ -22,7 +22,8 @@ requirements:
2222
- setuptools_scm >=1.15.0
2323
run:
2424
- nomkl
25-
- python >=3.5
25+
- conda
26+
- python 3.5.2
2627
- libgcc 4.8.5
2728
- gmp >=6.1
2829
- gsl >=2.2
@@ -43,12 +44,10 @@ requirements:
4344
- wrapt >=1.10.8
4445
- ad >=1.3.2
4546

46-
test:
47-
imports:
48-
- smcpp
49-
- smcpp._smcpp
50-
5147
about:
5248
home: https://github.com/popgenmethods/smcpp
5349
license: BSD
5450
license_file: LICENSE
51+
52+
build:
53+
script: python setup.py install --single-version-externally-managed --record=/dev/null

0 commit comments

Comments
 (0)