From 1060728aba5afbbd554316d27321afc9c7d4b466 Mon Sep 17 00:00:00 2001 From: Jo Bovy Date: Tue, 4 Aug 2015 08:40:05 -0400 Subject: [PATCH 1/5] try travis build for pynbody 53dcd5b1243a8b as per pynbody/pynbody#260 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 50d43dbcc..732a2135a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,8 @@ install: - easy_install --upgrade requests - easy_install --upgrade coveralls - pip install codecov - - if $REQUIRES_PYNBODY; then pip install git+git://github.com/pynbody/pynbody.git@cda64c8ac9fa59b83663b155d14d184eb33826a5; fi +#cda64c8ac9fa59b83663b155d14d184eb33826a5 + - if $REQUIRES_PYNBODY; then pip install git+git://github.com/pynbody/pynbody.git@53dcd5b1243a8b; fi - python setup.py build_ext --coverage --single_ext --inplace - python setup.py develop --single_ext script: From fc63b879316011654b980950758d0c351bd16676 Mon Sep 17 00:00:00 2001 From: Jo Bovy Date: Tue, 4 Aug 2015 10:24:28 -0400 Subject: [PATCH 2/5] updated pynbody commit (see pynbody/pynbody#260) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 732a2135a..a5812c240 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ install: - easy_install --upgrade coveralls - pip install codecov #cda64c8ac9fa59b83663b155d14d184eb33826a5 - - if $REQUIRES_PYNBODY; then pip install git+git://github.com/pynbody/pynbody.git@53dcd5b1243a8b; fi + - if $REQUIRES_PYNBODY; then pip install git+git://github.com/pynbody/pynbody.git@60485bbf1ff77a3834b06091df04abb384fdc797; fi - python setup.py build_ext --coverage --single_ext --inplace - python setup.py develop --single_ext script: From 7dde483c7fb54a2ab9908a04600f42adab44b30a Mon Sep 17 00:00:00 2001 From: Jo Bovy Date: Tue, 4 Aug 2015 14:02:30 -0400 Subject: [PATCH 3/5] go back to regular pynbody install, now that pynbody/pynbody#260 is fixed --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a5812c240..917543828 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,8 +48,7 @@ install: - easy_install --upgrade requests - easy_install --upgrade coveralls - pip install codecov -#cda64c8ac9fa59b83663b155d14d184eb33826a5 - - if $REQUIRES_PYNBODY; then pip install git+git://github.com/pynbody/pynbody.git@60485bbf1ff77a3834b06091df04abb384fdc797; fi + - if $REQUIRES_PYNBODY; then pip install git+git://github.com/pynbody/pynbody.git; fi - python setup.py build_ext --coverage --single_ext --inplace - python setup.py develop --single_ext script: From 740fd5346de9752b7f1fcf2c8be6095ead56869f Mon Sep 17 00:00:00 2001 From: Jo Bovy Date: Tue, 4 Aug 2015 15:14:44 -0400 Subject: [PATCH 4/5] loosen tolerance for fixedstepsize test, which keeps failing otherwise --- nose/test_orbit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nose/test_orbit.py b/nose/test_orbit.py index abf7b9c08..eaa107ff3 100644 --- a/nose/test_orbit.py +++ b/nose/test_orbit.py @@ -1254,7 +1254,7 @@ def test_fixedstepsize(): runtimes[ii]= time.time()-start for ii,mult in enumerate(mults): if ii == 0: continue - assert numpy.fabs(runtimes[ii]/runtimes[0]/mults[ii]*mults[0]-1.) < 0.3, 'Runtime of integration with fixed stepsize for integrator %s, type or orbit %s, stepsize reduction %i is not %i times less (residual is %g, times %g and %g)' % (integrator,type,mults[ii],mults[ii], + assert numpy.fabs(runtimes[ii]/runtimes[0]/mults[ii]*mults[0]-1.) < 0.4, 'Runtime of integration with fixed stepsize for integrator %s, type or orbit %s, stepsize reduction %i is not %i times less (residual is %g, times %g and %g)' % (integrator,type,mults[ii],mults[ii], numpy.fabs(runtimes[ii]/runtimes[0]/mults[ii]*mults[0]-1.),mults[ii]/mults[0],runtimes[ii]/runtimes[0]) return None From f92948a87ba9c59edbdd4891b343b68759765c5c Mon Sep 17 00:00:00 2001 From: Jo Bovy Date: Sun, 16 Aug 2015 18:02:27 -0400 Subject: [PATCH 5/5] only bash uploader necessary for codecov as per Steve Peak's email --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 917543828..6b32c896a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,6 @@ install: - gem install coveralls-lcov - easy_install --upgrade requests - easy_install --upgrade coveralls - - pip install codecov - if $REQUIRES_PYNBODY; then pip install git+git://github.com/pynbody/pynbody.git; fi - python setup.py build_ext --coverage --single_ext --inplace - python setup.py develop --single_ext @@ -57,7 +56,6 @@ after_success: # Generate lcov output - lcov --capture --base-directory . --directory build/temp.linux-x86_64-2.7/galpy/ --output-file coverage.info # Codecov - - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then codecov; fi - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then bash <(curl -s https://codecov.io/bash) -v; fi # coveralls: combine, generate json, and upload - coveralls-lcov -v -n coverage.info > coverage.c.json