-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'upcoming/version_3.0' into develop
# Conflicts: # create_software_bundle.sh # polar2grid/add_coastlines.py # setup.py
- Loading branch information
Showing
203 changed files
with
24,879 additions
and
14,165 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| *.png filter=lfs diff=lfs merge=lfs -text | ||
| *.psd filter=lfs diff=lfs merge=lfs -text | ||
| *.jpg filter=lfs diff=lfs merge=lfs -text | ||
| *.tif filter=lfs diff=lfs merge=lfs -text | ||
| *.mp4 filter=lfs diff=lfs merge=lfs -text |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,42 @@ | ||
| language: python | ||
| python: | ||
| - '2.7' | ||
| virtualenv: | ||
| system_site_packages: true | ||
| before_install: | ||
| - sudo add-apt-repository ppa:ubuntugis/ppa -y | ||
| - sudo apt-get update -qq | ||
| - sudo apt-get install -y -qq libgdal1h libproj0 | ||
| - sudo apt-get install -qq python-scipy python-numpy python-pyproj | ||
| language: generic | ||
| env: | ||
| global: | ||
| # Set defaults to avoid repeating in most cases | ||
| - PYTHON_VERSION=$TRAVIS_PYTHON_VERSION | ||
| - NUMPY_VERSION=stable | ||
| - MAIN_CMD='python setup.py' | ||
| - CONDA_DEPENDENCIES='xarray dask toolz Cython sphinx cartopy pillow matplotlib scipy pyyaml pyproj pyresample coveralls coverage codecov behave netcdf4 h5py h5netcdf gdal rasterio imageio pyhdf mock libtiff sphinx-argparse graphviz python-graphviz pycoast' | ||
| - PIP_DEPENDENCIES='trollsift trollimage pyspectral pyorbital libtiff' | ||
| - SETUP_XVFB=False | ||
| - EVENT_TYPE='push pull_request' | ||
| - SETUP_CMD='test' | ||
| - CONDA_CHANNELS='conda-forge' | ||
| - CONDA_CHANNEL_PRIORITY='True' | ||
| matrix: | ||
| include: | ||
| - env: PYTHON_VERSION=3.6 | ||
| os: linux | ||
| - env: PYTHON_VERSION=3.6 | ||
| os: osx | ||
| install: | ||
| - pip install -r requirements.txt | ||
| - pip install -e ".[remap]" | ||
| - git clone --depth 1 git://github.com/astropy/ci-helpers.git | ||
| - source ci-helpers/travis/setup_conda.sh | ||
| - pip install git+https://github.com/pytroll/satpy.git | ||
| - pip install -e . | ||
| script: | ||
| python -m polar2grid.tests | ||
| cd doc | ||
| make html | ||
| - python -m polar2grid.tests && cd doc && make html | ||
| # make clean | ||
| # make latexpdf | ||
| #after_success: | ||
| #- if [[ $PYTHON_VERSION == 3.6 ]]; then coveralls; codecov; fi | ||
| #deploy: | ||
| # - provider: pypi | ||
| # user: dhoese | ||
| # password: | ||
| # secure: frK+0k1STeTM7SizRseP0qdTfOVz9ZMIra+3qEytPdxCLceXAH8LxPU16zj5rdNQxasF1hZ6rAd952fly+ypw2TEf5r2WnStrt7G5QlyE7VB6XGSDpIUxKF1FYccLvYs0/R6Y35MTEPqdM51PM5yEBjoY5b4tA3RF3fDq11cqc/SiWr6DgSLB1WJZULOdtCzBbfGbm5LyJ7yeNbISASSAwVvZTGWw7kJDgi0W5zxwEX82N5tBGbfKIu59qmxyj8FxmcrUwKZ4P3rQNg1kN1utzAB+PSf3GAVvbZfWJQuAKwMqpZgaV9lX0V7eUd/AxPobzEk9WyoNBMIdrSPej5BKWTDiYvaeRTOsggoUCSQJJA/SITEvkJgLWXoKKX2OWrM8RBUO4MoZJpPGXN42PRtMJkV2sx6ZigkpJlHdn39SsIRZX31zsfv8bBhclb70bt1Ts0fDd0rVdZAI6gMI+sgUePwEUn+XbWrvI0sMfDX3QsXDMV393RHgaIPxd+lRqUlYsNOxjsWpsbsvX55ePLxYHsNrv11KKyL/iGjGotVeVUO5D78qvfd4JrsUnMalQyZfW8NTEKa5Ebcs7gYJTwYEOTCQU12BkHOv1zFkjZG5RdGwkEvG3pykLhx+qDyYEd7pKB3TvhzLPqZPSrPxirwcoc0UzCc6ocYdzpqVuViFuk= | ||
| # distributions: sdist bdist_wheel | ||
| # skip_existing: true | ||
| # on: | ||
| # tags: true | ||
| # repo: pytroll/satpy | ||
|
|
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| Release Notes | ||
| ============= | ||
|
|
||
| Version 1.0.0 (unreleased) | ||
| -------------------------- | ||
|
|
||
| * New Geo2Grid Package! | ||
| * ABI L1B (abi_l1b) reader added | ||
| * AHI HSD (ahi_hsd) reader added | ||
| * AHI HRIT/HimawariCast (ahi_hrit) reader added | ||
| * Geotiff (geotiff) writer added | ||
| * Multi-threaded (multiple worker) processing | ||
| * Sharpened rayleigh-corrected full-resolution true and natural color RGBs | ||
| * Command line Lat/Lon defined subsets | ||
| * User defined grid capability | ||
| * MIN/MAX native resampling possible |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| #!/usr/bin/env bash | ||
| # Create a software bundle from a conda environment | ||
| # Usage: ./create_conda_software_bundle.sh <bundle directory> | ||
| # Creates a software bundle directory and a tarball of that directory | ||
|
|
||
| #SHELLB3_DEFAULT="ftp://ftp.ssec.wisc.edu/pub/shellb3/ShellB3-Linux-x86_64-20140212-r840-core-cspp.tar.gz" | ||
| BASE_P2G_DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | ||
| PY_DIR="$BASE_P2G_DIR" | ||
| BUNDLE_SCRIPTS_DIR="$BASE_P2G_DIR"/swbundle | ||
| VCREFL_DIR="$BASE_P2G_DIR"/viirs_crefl | ||
| MCREFL_DIR="$BASE_P2G_DIR"/modis_crefl | ||
| CACHE_DIR="/tmp" | ||
|
|
||
| oops() { | ||
| echo "OOPS: $*" | ||
| echo "FAILURE" | ||
| exit 1 | ||
| } | ||
|
|
||
| cached_download() { | ||
| fn=`basename $1` | ||
| cache_path="${CACHE_DIR}/$fn" | ||
| pushd $CACHE_DIR | ||
| if [ ! -f $cache_path ]; then | ||
| wget $1 || oops "Could not download $1" | ||
| fi | ||
| popd | ||
| cp $cache_path . || oops "Could not copy cached download ${cache_path}" | ||
| } | ||
|
|
||
| # This assumes that the current conda environment is already active | ||
| which conda || oops "Conda environment must be available" | ||
| if [ $# -eq 1 ]; then | ||
| SB_NAME=$1 | ||
| else | ||
| echo "ERROR: Invalid Arguments" | ||
| echo "Usage: ./create_conda_software_bundle.sh <bundle name>" | ||
| exit 1 | ||
| fi | ||
|
|
||
| if [[ $SB_NAME == *"polar"* ]]; then | ||
| PROJECT="P2G" | ||
| else | ||
| PROJECT="G2G" | ||
| fi | ||
|
|
||
| pip install -U --no-deps . || oops "Couldn't install current polar2grid package" | ||
|
|
||
| SB_TARBALL="${SB_NAME}.tar.gz" | ||
| conda-pack -o $SB_TARBALL || oops "Couldn't create conda-packed tarball" | ||
| mkdir -p ${SB_NAME} || oops "Couldn't make output directory" | ||
| tar -xzf ${SB_TARBALL} -C ${SB_NAME} || oops "Couldn't untar conda-packed tarball" | ||
| cd ${SB_NAME} || oops "Couldn't change to software bundle directory" | ||
|
|
||
| echo "Copying user grid directory to software bundle" | ||
| cp -r ${BUNDLE_SCRIPTS_DIR}/grid_configs . | ||
| cp -r ${BUNDLE_SCRIPTS_DIR}/colormaps . | ||
| cp -r ${BUNDLE_SCRIPTS_DIR}/rescale_configs . | ||
|
|
||
| mkdir -p gshhg_data || oops "Could not make GSHHG data directory" | ||
| pushd gshhg_data | ||
| echo "Downloading GSHHG shapefiles" | ||
| cached_download https://www.soest.hawaii.edu/pwessel/gshhg/gshhg-shp-2.3.6.zip | ||
| unzip gshhg-shp-2.3.6.zip || oops "Could not unpack GSHHG shapefiles" | ||
| rm gshhg-shp-2.3.6.zip || oops "Could not delete the GSHHG zip file" | ||
| popd | ||
|
|
||
| # Create the VIIRS CREFL utilities | ||
| echo "Getting prebuilt VIIRS CREFL binaries..." | ||
| cd "$VCREFL_DIR" | ||
| make clean | ||
| make prebuilt || oops "Couldn't get prebuilt VIIRS CREFL binaries" | ||
| chmod a+x cviirs | ||
| chmod a+x h5SDS_transfer_rename | ||
| mv cviirs "$SB_NAME"/bin/ | ||
| mv h5SDS_transfer_rename "$SB_NAME"/bin/ | ||
| mv CMGDEM.hdf "$SB_NAME"/bin/ | ||
| cp run_viirs_crefl.sh "$SB_NAME"/bin/ | ||
| chmod a+x "$SB_NAME"/bin/run_viirs_crefl.sh | ||
|
|
||
| # Create the MODIS CREFL utilities | ||
| echo "Getting prebuilt MODIS CREFL binaries..." | ||
| cd "$MCREFL_DIR" | ||
| make clean | ||
| make prebuilt || oops "Couldn't get prebuilt MODIS CREFL binaries" | ||
| chmod a+x crefl | ||
| mv crefl "$SB_NAME"/bin/ | ||
| mv tbase.hdf "$SB_NAME"/bin/ | ||
| cp run_modis_crefl.sh "$SB_NAME"/bin/ | ||
| chmod a+x "$SB_NAME"/bin/run_modis_crefl.sh | ||
|
|
||
| echo "Copying bash scripts to software bundle bin" | ||
| cd "$SB_NAME" | ||
| cp -P ${BUNDLE_SCRIPTS_DIR}/*.sh ${BUNDLE_SCRIPTS_DIR}/*.txt bin/ || echo "Couldn't copy scripts to bin/ directory" | ||
| # clean up readmes | ||
| if [[ $PROJECT == "P2G" ]]; then | ||
| rm -f bin/GEO2GRID_README.txt | ||
| mv bin/POLAR2GRID_README.txt README.txt | ||
| else | ||
| rm -f bin/POLAR2GRID_README.txt | ||
| mv bin/GEO2GRID_README.txt README.txt | ||
| fi | ||
|
|
||
|
|
||
| # Copy the release notes to the tarball | ||
| cp $BASE_P2G_DIR/NEWS.rst $SB_NAME/RELEASE_NOTES.txt || oops "Couldn't copy release notes to destination directory" | ||
|
|
||
| # Create a wmsupload.sh script | ||
| cd $SB_NAME/bin | ||
| wget https://realearth.ssec.wisc.edu/upload/re_upload || oops "Couldn't download and create re_upload script" | ||
| chmod u+x re_upload || oops "Couldn't make wmsupload.sh executable" | ||
|
|
||
| # Copy SatPy configurations | ||
| mkdir $SB_NAME/etc/satpy || oops "Couldn't create configuration 'etc/satpy' directory" | ||
| cp -r $BASE_P2G_DIR/etc/* $SB_NAME/etc/satpy/ || oops "Couldn't copy configuration 'etc' directory" | ||
|
|
||
| # Download pyspectral data | ||
| echo "Downloading pyspectral data..." | ||
| $SB_NAME/bin/download_pyspectral_data.sh || oops "Couldn't download pyspectral data" | ||
|
|
||
| # FIXME: Add the download_from_internet: False to the config | ||
| echo "download_from_internet: False" >> ${SB_NAME}/etc/pyspectral.yaml | ||
|
|
||
| # Tar up the software bundle | ||
| echo "Creating software bundle tarball..." | ||
| cd "$SB_NAME"/.. | ||
| rm -f ${SB_TARBALL} | ||
| tar -czf "$SB_TARBALL" "$(basename "$SB_NAME")" | ||
|
|
||
| echo "SUCCESS" |
Oops, something went wrong.