Skip to content

Commit

Permalink
fix for conda install
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcYin committed Nov 5, 2018
1 parent 583c7d7 commit 4267789
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ language: python
python:
- "2.7"
- "3.6"
- "3.7"
install:
- sudo apt-get update
- echo $TRAVIS_PYTHON_VERSION
Expand All @@ -16,7 +17,7 @@ install:
- conda config --set always_yes yes --set changeps1 no
- conda config --add channels conda-forge
- conda update -q conda
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION pytest pyyaml scipy numpy psutil six lightgbm requests scikit-learn scikit-image gdal=2.2.4 coveralls pytest-cov coverage=4.5.1 h5py
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION pytest pyyaml scipy numpy psutil six lightgbm requests scikit-learn scikit-image gdal>=2.1 coveralls pytest-cov coverage=4.5.1 h5py
- source activate test-environment
- conda info -a
- conda list
Expand Down
2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ include SIAC/data/sen2cloud_detector.pkl
include SIAC/data/.earthdata_auth
include SIAC/spectral_mapping/*
include SIAC/tests/*.py
include SIAC/tests/aoi.geojson
include SIAC/tests/s2_flists.txt
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ This atmospheric correction method uses MODIS MCD43 BRDF product to get a coarse

## Installation:

Download this repositories either by `git clone git@ github.com:MarcYin/SIAC.git` or download the zip file and unzip it. In the main directory of it excute `pip install .` , or `pip install SIAC` or `conda install -c f0xy siac`
Download this repositories either by `git clone git@ github.com:MarcYin/SIAC.git` or download the zip file and unzip it. In the main directory of it excute `pip install .` , or `pip install SIAC` or `conda install -c f0xy -c conda-forge siac`

To save your time for installing GDAL and lightgbm, please use:

Expand Down
2 changes: 1 addition & 1 deletion SIAC/the_correction.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python
import os
import sys
import sys
import ogr
import gdal
import psutil
Expand Down

0 comments on commit 4267789

Please sign in to comment.