Merge pull request #44 from pysat/rc3.0.0_integration_test

Updated .travis.yml for pysat 3.0.0 release

.travis.yml

@@ -19,36 +19,15 @@ addons:
     - gfortran
     - libncurses5-dev
 
-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
-  - conda activate test-environment
-  - while read requirement; do conda install --yes $requirement; done < conda_requirements.txt
-  # Conda does not provide (the correct versions of) all packages
-  - pip install -r pip_requirements.txt
-  # Custom pysat install, no longer needed after 3.0 release
-  - cd ..
-  - git clone --single-branch --branch develop-3 https://github.com/pysat/pysat.git
-  - cd pysat
-  # Install the pysat requirements
-  - while read requirement; do conda install --yes $requirement; done < requirements.txt
-  - python setup.py install
-  - export PYTHONPATH=$PYTHONPATH:$(pwd)
+before_install:
+  - python -m pip install --upgrade pip
+  # Get the program and testing requirements
+  - pip install -r test_requirements.txt
+  - pip install -r requirements.txt
   # set up data directory
   - mkdir /home/travis/build/pysatData
-  - cd ../pysatMadrigal
-  # install pysatMadrigal
+  - python -c "import pysat; pysat.params['data_dirs'] = '/home/travis/build/pysatData'"
+install:
   - python setup.py install
 
 after_success:

conda_requirements.txt → requirements.txt

@@ -1,4 +1,5 @@
 h5py
+madrigalWeb
 numpy
 pandas
 pysat>=3.0

pip_requirements.txt → test_requirements.txt

@@ -1,6 +1,5 @@
 coveralls
 m2r2
-madrigalWeb
 numpydoc
 pytest-cov
 pytest-ordering