Skip to content

Commit

Permalink
Merge 5265393 into 3b2ca51
Browse files Browse the repository at this point in the history
  • Loading branch information
jklenzing committed Apr 23, 2020
2 parents 3b2ca51 + 5265393 commit 3c3b55e
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 7 deletions.
30 changes: 23 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,32 @@ addons:
packages:
- gfortran

before_install:
install:
- sudo apt-get update
# We do this conditionally because it saves us some downloading if the
# version is the same.
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
- bash miniconda.sh -b -p $HOME/miniconda
- source "$HOME/miniconda/etc/profile.d/conda.sh"
- hash -r
- conda config --set always_yes True --set changeps1 False
- conda update -q conda
# Useful for debugging any issues with conda
- conda info -a
# Create conda test environment
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy scipy pandas xarray requests beautifulsoup4 lxml netCDF4 h5py nose pytest-cov pytest-ordering coveralls future
- conda activate test-environment
# Check for custom numpy version install
- if [ -z ${NUMPY_VER} ]; then
echo 'Using latest numpy';
else
pip install -q numpy==$NUMPY_VER;
conda install numpy==$NUMPY_VER;
fi
- pip install pytest-cov
- pip install coveralls
- pip install future
# Dependencies not available through conda, install through pip
- pip install apexpy
- pip install madrigalWeb
- pip install PyForecastTools
- pip install pysatCDF >/dev/null

# Prepare modified pysat install
- cd ..
Expand All @@ -48,9 +64,9 @@ before_install:
- cd ./pyglow
- make -C src/pyglow/models source >/dev/null
- python setup.py install >/dev/null
- cd ../pysatMissions

install:
# install pysatMissions
- cd ../pysatMissions
- python setup.py install

before_script:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [0.2.1] - 2020-04-22
- Use conda to manage Travis CI environment

## [0.2.0] - 2020-03-07
- Renamed as pysatMissions
- Added method files to access aacgmv2, apexpy, pyglow for any pysat instrument
Expand Down

0 comments on commit 3c3b55e

Please sign in to comment.