Skip to content

Commit

Permalink
Merge pull request #81 from jklenzing/remove_27
Browse files Browse the repository at this point in the history
Updates to setup
  • Loading branch information
jklenzing committed Sep 25, 2019
2 parents 0f61894 + 16ea43b commit 7415814
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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/
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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 =

0 comments on commit 7415814

Please sign in to comment.