Skip to content

Commit

Permalink
Deactivate update integration test
Browse files Browse the repository at this point in the history
  • Loading branch information
FlorianWilhelm committed Sep 16, 2015
1 parent c2850b4 commit 3d2390a
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 17 deletions.
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sudo: required
sudo: false
language: python
virtualenv:
system_site_packages: true
Expand All @@ -22,16 +22,13 @@ addons:
- git
- python-pip
- gfortran
- libgfortran
- libgfortran-4.6-dev
- libgfortran-4.7-dev
- libgfortran3
install:
- source tests/travis_install.sh
- pip install -r requirements.txt
- pip install django
- pip install sphinx
- pip install cookiecutter
- sudo apt-get -y install libgfortran3
before_script:
- git config --global user.email "you@example.com"
- git config --global user.name "Your Name"
Expand Down
24 changes: 12 additions & 12 deletions tests/system_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,18 @@ rm -rf ${PROJECT}
putup --with-travis ${PROJECT}
run_common_tasks ${PROJECT}
# Test update from PyScaffold version 2.0
if [[ "${DISTRIB}" == "conda" && "${PYTHON_VERSION}" == "2.7" ]]; then
TMPDIR="update_test"
mkdir ${TMPDIR}; cd ${TMPDIR}
git clone --branch v0.2 https://github.com/blue-yonder/pydse.git pydse
cp ${TRAVIS_BUILD_DIR}/tests/misc/pydse_setup.cfg pydse/setup.cfg
putup --update pydse
conda install --yes numpy=1.9.1 scipy=0.14.0 matplotlib
pip install -v -r pydse/requirements.txt
run_common_tasks pydse
cd ..
rm -rf ${TMPDIR}
fi
#if [[ "${DISTRIB}" == "conda" && "${PYTHON_VERSION}" == "2.7" ]]; then
# TMPDIR="update_test"
# mkdir ${TMPDIR}; cd ${TMPDIR}
# git clone --branch v0.2 https://github.com/blue-yonder/pydse.git pydse
# cp ${TRAVIS_BUILD_DIR}/tests/misc/pydse_setup.cfg pydse/setup.cfg
# putup --update pydse
# conda install --yes numpy=1.9.1 scipy=0.14.0 matplotlib
# pip install -v -r pydse/requirements.txt
# run_common_tasks pydse
# cd ..
# rm -rf ${TMPDIR}
#fi
# Test namespace package
PROJECT="nested_project"
# Delete old project if necessary
Expand Down

0 comments on commit 3d2390a

Please sign in to comment.