diff --git a/.travis.yml b/.travis.yml index 2b4d9132..6813d7ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,8 @@ before_install: - pip install pytest-cov - pip install coveralls - pip install future + - pip install pandas + - pip install xarray - pip install matplotlib install: @@ -26,10 +28,6 @@ install: before_script: # set up display screen - export DISPLAY=:99.0 - - if [[ $TRAVIS_PYTHON_VERSION < "3.0" ]]; then - sh -e /etc/init.d/xvfb start; - sleep 3; - fi script: - pytest -vs --cov=sami2py/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 06ee3d1f..8ddb478d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Added CHANGELOG.md - Switched to pytest for unit testing - Removes python 3.4 testing from Travis + - Adds manual install of pandas / xarray to Travis workflow to fix setup ## [0.1.2] - 2019-07-02 - Patch to fix loading of unformatted output files. diff --git a/setup.cfg b/setup.cfg index 748dc351..fec89c39 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,7 +15,6 @@ classifiers = License :: BSD Natural Language :: English Programming Language :: Python :: 2.7 - Programming Language :: Python :: 3.4 Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 @@ -25,7 +24,7 @@ long_description = file: README.md long_description_content_type = text/markdown [options] -python_requires = >= 2.7 +python_requires = >= 3.5 setup_requires = setuptools >= 38.6 pip >= 10 @@ -34,6 +33,7 @@ zip_safe = False packages = find: install_requires = numpy - pandas<0.25 # FIXME: upper limit on pandas and xarray are just so Travis CI passes python 2.7 tests. - xarray<0.12 + pandas + xarray + matplotlib scripts =