Use of travis_wait to fix the timeout problem on "fixing permission".

threeML · Oct 29, 2019 · c92f543 · c92f543
1 parent 449c537
commit c92f543
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,5 +30,5 @@ before_install:
 
 script:
   - chmod u+x ci/build_and_test.sh
-  - ./ci/build_and_test.sh
+  - travis_wait 120 ./ci/build_and_test.sh
 
diff --git a/build_local.sh b/build_local.sh
@@ -5,7 +5,7 @@ set -e
 # FLAGS AND ENVIRONMENT:
 
 TRAVIS_OS_NAME="unknown"
-UPDATE_CONDA=false
+UPDATE_CONDA=true
 TRAVIS_PYTHON_VERSION=2.7
 TRAVIS_BUILD_NUMBER=1
 
@@ -93,6 +93,7 @@ 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
+#conda install conda-verify
 
 # Build package
 echo "Build package..."

diff --git a/ci/build_and_test.sh b/ci/build_and_test.sh
@@ -63,6 +63,9 @@ fi
 
 # Build package
 echo "Build package..."
+
+#conda install conda-verify
+
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
     conda build --python=$TRAVIS_PYTHON_VERSION conda_recipe/xspec-modelsonly
     #conda index $HOME/miniconda/conda-bld

diff --git a/conda_recipe/xspec-modelsonly/meta.yaml b/conda_recipe/xspec-modelsonly/meta.yaml
@@ -20,20 +20,10 @@ requirements:
       - {{ compiler('cxx') }} # [linux]
       - {{ compiler('fortran') }} # [linux]
       - libgfortran>=3.0
-      #- libpng 1.6.34
-      #- libxcb 1.12
       - ncurses==5.9
-      #- perl 5.20.3.1
-      #- pgplot 5.2.2
       - readline==6.2
       - toolchain==2.1.2
       - wcslib==5.18
-      #- xorg-kbproto 1.0.7 1
-      #- xorg-libx11 1.6.4 6
-      #- xorg-libxau 1.0.8 3
-      #- xorg-libxdmcp 1.1.2 3
-      #- xorg-xproto 7.0.31 6
-      #- zlib 1.2.11
     run:
       - ccfits==2.5
       - cfitsio==3.410