diff --git a/.travis.yml b/.travis.yml index 4b3788e..af90f3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,5 +30,5 @@ before_install: script: - chmod u+x ci/build_and_test.sh - - travis_wait 30 ./ci/build_and_test.sh + - ./ci/build_and_test.sh diff --git a/build_local.sh b/build_local.sh index 56d2360..7343e7e 100755 --- a/build_local.sh +++ b/build_local.sh @@ -89,6 +89,10 @@ echo "=====================> Activate test environment..." source $CONDA_PREFIX/etc/profile.d/conda.sh conda activate $ENVNAME #source activate $ENVNAME +echo "======> getting the file..." +if ! [ -f xspec-modelsonly-v6.22.1.tar.gz ]; then + curl -LO -z xspec-modelsonly-v6.22.1.tar.gz https://heasarc.gsfc.nasa.gov/FTP/software/lheasoft/lheasoft6.22.1/xspec-modelsonly-v6.22.1.tar.gz +fi # Build package echo "Build package..." diff --git a/ci/build_and_test.sh b/ci/build_and_test.sh index eaa5e4d..03d41bf 100755 --- a/ci/build_and_test.sh +++ b/ci/build_and_test.sh @@ -56,6 +56,11 @@ echo "=====================> Activate test environment..." source activate $ENVNAME +echo "======> getting the file..." +if ! [ -f xspec-modelsonly-v6.22.1.tar.gz ]; then + curl -LO -z xspec-modelsonly-v6.22.1.tar.gz https://heasarc.gsfc.nasa.gov/FTP/software/lheasoft/lheasoft6.22.1/xspec-modelsonly-v6.22.1.tar.gz +fi + # Build package echo "Build package..." if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then diff --git a/conda_recipe/xspec-modelsonly/build.sh b/conda_recipe/xspec-modelsonly/build.sh index 497ca43..b9dc842 100644 --- a/conda_recipe/xspec-modelsonly/build.sh +++ b/conda_recipe/xspec-modelsonly/build.sh @@ -1,4 +1,7 @@ -cd BUILD_DIR +echo "=================" +echo $PWD +tar xf xspec-modelsonly-v6.22.1.tar.gz +cd xspec-modelsonly-v6.22.1/BUILD_DIR # We need a custom include and library path to use the packages installed # in the build environment diff --git a/conda_recipe/xspec-modelsonly/meta.yaml b/conda_recipe/xspec-modelsonly/meta.yaml index f668c52..2dd98ea 100644 --- a/conda_recipe/xspec-modelsonly/meta.yaml +++ b/conda_recipe/xspec-modelsonly/meta.yaml @@ -3,9 +3,10 @@ package: version: "6.22.1" source: -# md5: 0abea9e1609fcdc2c3e3ada92043d17b - url: https://heasarc.gsfc.nasa.gov/FTP/software/lheasoft/lheasoft6.22.1/xspec-modelsonly-v6.22.1.tar.gz - fn: xspec-modelsonly-v6.22.1.tar.gz + # md5: 0abea9e1609fcdc2c3e3ada92043d17b + # url: https://heasarc.gsfc.nasa.gov/FTP/software/lheasoft/lheasoft6.22.1/xspec-modelsonly-v6.22.1.tar.gz + path: ../../xspec-modelsonly-v6.22.1.tar.gz + #fn: xspec-modelsonly-v6.22.1.tar.gz build: number: 1 @@ -15,6 +16,7 @@ requirements: - ccfits==2.5 - cfitsio==3.410 - gfortran_osx-64 # [osx] + - gcc # [linux] - libgfortran>=3.0 #- libpng 1.6.34 #- libxcb 1.12