diff --git a/.travis.yml b/.travis.yml index 6742b2f35..fdd1f95e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,8 +47,7 @@ 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@cda64c8ac9fa59b83663b155d14d184eb33826a5; 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: @@ -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 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