Merge 9801a3b into 451e087

.travis.yml

@@ -1,10 +1,9 @@
 language: python
 env:
   global:
-  - PYTHON_VERSION=$PYTHON_VERSION
   - NUMPY_VERSION=stable
   - MAIN_CMD='python setup.py'
-  - CONDA_DEPENDENCIES='scipy numpy coveralls coverage h5py mock requests six appdirs python-geotiepoints dask'
+  - CONDA_DEPENDENCIES='scipy numpy coveralls coverage h5py mock requests six appdirs python-geotiepoints dask docutils pyyaml xlrd'
   - PIP_DEPENDENCIES=''
   - SETUP_XVFB=False
   - EVENT_TYPE='push pull_request'
@@ -23,8 +22,11 @@ matrix:
       os: osx
       language: generic
 install:
-- git clone --depth 1 git://github.com/astropy/ci-helpers.git
-- source ci-helpers/travis/setup_conda.sh
+    - git clone --depth 1 git://github.com/astropy/ci-helpers.git
+    - source ci-helpers/travis/setup_conda.sh
+    # See https://github.com/conda/conda/issues/7626#issuecomment-412922028
+    - conda config --remove channels defaults
+    - conda install -y $CONDA_DEPENDENCIES
 script: coverage run --source=pyspectral setup.py test
 after_success:
 - if [[ $PYTHON_VERSION == 3.6 ]]; then coveralls; fi

appveyor.yml

@@ -3,7 +3,7 @@ environment:
     PYTHON: "C:\\conda"
     MINICONDA_VERSION: "latest"
     CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci-helpers\\appveyor\\windows_sdk.cmd"
-    CONDA_DEPENDENCIES: "scipy numpy coveralls coverage h5py mock requests six appdirs python-geotiepoints dask"
+    CONDA_DEPENDENCIES: "scipy numpy coveralls coverage h5py mock requests six appdirs python-geotiepoints dask docutils pyaml xlrd"
     PIP_DEPENDENCIES: ""
     CONDA_CHANNELS: "conda-forge"
 

pyspectral/abi_rsr.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2016 Adam.Dybbroe
+# Copyright (c) 2016 - 2018 PyTroll community
 
 # Author(s):
 
@@ -23,7 +23,7 @@
 """Reading the original raw GOES-R ABI spectral responses and generating the
 internal pyspectral formatet hdf5.
 
-http://ncc.nesdis.noaa.gov/GOESR/docs/GOES-R_ABI_PFM_SRF_CWG_v3.zip
+https://ncc.nesdis.noaa.gov/GOESR/ABI.php
 
 """
 
@@ -91,7 +91,7 @@ def _load(self, scale=1.0):
 
 def main():
     """Main"""
-    for platform_name in ['GOES-16', ]:
+    for platform_name in ['GOES-16', 'GOES-17', ]:
         tohdf5(AbiRSR, platform_name, ABI_BAND_NAMES)
 
 

pyspectral/utils.py

@@ -121,10 +121,9 @@
                'NOAA-20': 'viirs'
                }
 
-
-HTTP_PYSPECTRAL_RSR = "https://zenodo.org/record/1205138/files/pyspectral_rsr_data.tgz"
+HTTP_PYSPECTRAL_RSR = "https://zenodo.org/record/1409621/files/pyspectral_rsr_data.tgz"
 RSR_DATA_VERSION_FILENAME = "PYSPECTRAL_RSR_VERSION"
-RSR_DATA_VERSION = "v1.0.1"
+RSR_DATA_VERSION = "v1.0.2"
 
 ATM_CORRECTION_LUT_VERSION = {}
 ATM_CORRECTION_LUT_VERSION['antarctic_aerosol'] = {'version': 'v1.0.1',

setup.py

@@ -21,6 +21,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
+from setuptools import setup
+import imp
+import os.path
 
 try:
     with open('./README', 'r') as fd:
@@ -34,7 +37,7 @@
             'appdirs']
 
 dask_extra = ['dask[array]']
-test_requires = ['xlrd', 'pyyaml', 'matplotlib', 'dask[array]']
+test_requires = ['pyyaml', 'dask[array]', 'xlrd']  # , 'matplotlib']
 if sys.version < '3.0':
     test_requires.append('mock')
     try:
@@ -44,14 +47,10 @@
     except ImportError:
         pass
 
-if sys.version >= '3.6':
-    # h5pickle 0.3 only supports 3.6+
-    test_requires.append('h5pickle')
-    dask_extra.append('h5pickle')
-
-from setuptools import setup
-import imp
-import os.path
+# if sys.version >= '3.6':
+#     # h5pickle 0.3 only supports 3.6+
+#     test_requires.append('h5pickle')
+#     dask_extra.append('h5pickle')
 
 version = imp.load_source('pyspectral.version', 'pyspectral/version.py')