.stickler.yml

 linters:
   flake8:
-    max-line-length: 120
+    python: 3
+    config: setup.cfg

.travis.yml

@@ -5,7 +5,7 @@ env:
         - 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'
+        - 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 pycoast pydecorate'
         - PIP_DEPENDENCIES='trollsift trollimage pyspectral pyorbital libtiff'
         - SETUP_XVFB=False
         - EVENT_TYPE='push pull_request'
@@ -45,4 +45,4 @@ deploy:
 notifications:
   slack:
     rooms:
-    - pytroll:96mNSYSI1dBjGyzVXkBT6qFt#satpy
+    - pytroll:96mNSYSI1dBjGyzVXkBT6qFt#github

CHANGELOG.md

-###############################################################################
+## Version 0.11.0 (2018/12/21)
+
+### Issues Closed
+
+* [Issue 555](https://github.com/pytroll/satpy/issues/555) - GOES-16 geolocation seems off when saving as TIFF
+* [Issue 552](https://github.com/pytroll/satpy/issues/552) - GOES Composites failling ([PR 553](https://github.com/pytroll/satpy/pull/553))
+* [Issue 534](https://github.com/pytroll/satpy/issues/534) - Support GOES-15 in netcdf format from Eumetcast (`nc_goes` reader) ([PR 530](https://github.com/pytroll/satpy/pull/530))
+* [Issue 527](https://github.com/pytroll/satpy/issues/527) - [SEP] Reader naming conventions ([PR 546](https://github.com/pytroll/satpy/pull/546))
+* [Issue 518](https://github.com/pytroll/satpy/issues/518) - Make bilinear interpolation dask/xarray friendly ([PR 519](https://github.com/pytroll/satpy/pull/519))
+* [Issue 467](https://github.com/pytroll/satpy/issues/467) - Flake8-ify all of satpy ([PR 515](https://github.com/pytroll/satpy/pull/515))
+* [Issue 459](https://github.com/pytroll/satpy/issues/459) - How to colorize images
+* [Issue 449](https://github.com/pytroll/satpy/issues/449) - Adding coastlines to single channel not working ([PR 551](https://github.com/pytroll/satpy/pull/551))
+* [Issue 337](https://github.com/pytroll/satpy/issues/337) - Plot true color by using VIIRS SDR
+* [Issue 333](https://github.com/pytroll/satpy/issues/333) - `available_readers` to detail unavailable items
+* [Issue 263](https://github.com/pytroll/satpy/issues/263) - How to get the available dataset names from the reader
+* [Issue 147](https://github.com/pytroll/satpy/issues/147) - SEVIRI HRIT reading: More userfriendly warning when no EPI/PRO files are present ([PR 452](https://github.com/pytroll/satpy/pull/452))
+
+In this release 12 issues were closed.
+
+### Pull Requests Merged
+
+#### Bugs fixed
+
+* [PR 556](https://github.com/pytroll/satpy/pull/556) - Fix turning off enhancements in writers for float data
+* [PR 553](https://github.com/pytroll/satpy/pull/553) - Fix DifferenceCompositor and other compositors when areas are incompatible ([552](https://github.com/pytroll/satpy/issues/552), [552](https://github.com/pytroll/satpy/issues/552))
+* [PR 550](https://github.com/pytroll/satpy/pull/550) - Fix AHI HRIT file patterns so area's ID is correct
+* [PR 548](https://github.com/pytroll/satpy/pull/548) - Fix ratio sharpening compositors when the ratio is negative
+* [PR 547](https://github.com/pytroll/satpy/pull/547) - Fix EWA resampling for new versions of pyresample
+* [PR 542](https://github.com/pytroll/satpy/pull/542) - Fix palette application for pps 2018 products
+* [PR 508](https://github.com/pytroll/satpy/pull/508) - Fix the cf_writer to accept single-valued time coordinate variable
+
+#### Features added
+
+* [PR 558](https://github.com/pytroll/satpy/pull/558) - Make counts available in ahi_hsd
+* [PR 551](https://github.com/pytroll/satpy/pull/551) - Fix image overlays for single band data (requires trollimage 1.6+) ([449](https://github.com/pytroll/satpy/issues/449))
+* [PR 549](https://github.com/pytroll/satpy/pull/549) - Fix nwcpps ct palette from v2018 to be backwards compatible
+* [PR 546](https://github.com/pytroll/satpy/pull/546) - Rename readers to meet new reader naming scheme ([527](https://github.com/pytroll/satpy/issues/527))
+* [PR 545](https://github.com/pytroll/satpy/pull/545) - Add configurable parameters to solar zenith correctors
+* [PR 530](https://github.com/pytroll/satpy/pull/530) - Add reader for Goes15 netcdf Eumetsat format ([534](https://github.com/pytroll/satpy/issues/534))
+* [PR 519](https://github.com/pytroll/satpy/pull/519) - Add xarray/dask bilinear resampling ([518](https://github.com/pytroll/satpy/issues/518))
+* [PR 507](https://github.com/pytroll/satpy/pull/507) - Change default enhancement for reflectance data to gamma 1.5
+* [PR 452](https://github.com/pytroll/satpy/pull/452) - Improve handling of missing file requirements in readers ([147](https://github.com/pytroll/satpy/issues/147))
+
+#### Documentation changes
+
+* [PR 533](https://github.com/pytroll/satpy/pull/533) - Fix copy/paste error in readers table for viirs_l1b
+* [PR 515](https://github.com/pytroll/satpy/pull/515) - Fix all flake8 errors in satpy package code ([467](https://github.com/pytroll/satpy/issues/467))
+
+#### Backwards incompatible changes
+
+* [PR 546](https://github.com/pytroll/satpy/pull/546) - Rename readers to meet new reader naming scheme ([527](https://github.com/pytroll/satpy/issues/527))
+* [PR 507](https://github.com/pytroll/satpy/pull/507) - Change default enhancement for reflectance data to gamma 1.5
+
+In this release 20 pull requests were closed.
+
+
 ## Version 0.10.0 (2018/11/23)
 
 ### Issues Closed
@@ -66,10 +121,11 @@ In this release 13 issues were closed.
 * [PR 443](https://github.com/pytroll/satpy/pull/443) - Add long_description to setup.py ([397](https://github.com/pytroll/satpy/issues/397))
 * [PR 440](https://github.com/pytroll/satpy/pull/440) - Fix CI badges in README
 
-In this release 36 pull requests were closed.
-
+#### Backwards incompatible changes
 
+* [PR 485](https://github.com/pytroll/satpy/pull/485) - Deprecate 'enhancement_config' keyword argument in favor of 'enhance'
 
+In this release 37 pull requests were closed.
 
 
 ## Version 0.9.4 (2018/09/29)

RELEASING.md

@@ -6,7 +6,7 @@
 4. run `loghub` and update the `CHANGELOG.md` file:
 
 ```
-loghub pytroll/satpy -u <username> -st v0.8.0 -plg bug "Bugs fixed" -plg enhancement "Features added" -plg documentation "Documentation changes"
+loghub pytroll/satpy -u <username> -st v0.8.0 -plg bug "Bugs fixed" -plg enhancement "Features added" -plg documentation "Documentation changes" -plg backwards-incompatibility "Backwards incompatible changes"
 ```
 
 Don't forget to commit!

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: "xarray dask toolz Cython sphinx cartopy pillow matplotlib scipy pyyaml pyproj pyresample coverage netcdf4 h5py h5netcdf gdal rasterio imageio pyhdf mock libtiff"
+    CONDA_DEPENDENCIES: "xarray dask toolz Cython sphinx cartopy pillow matplotlib scipy pyyaml pyproj pyresample coverage netcdf4 h5py h5netcdf gdal rasterio imageio pyhdf mock libtiff pycoast pydecorate"
     PIP_DEPENDENCIES: "trollsift trollimage pyspectral pyorbital libtiff"
     CONDA_CHANNELS: "conda-forge"
 
@@ -23,6 +23,10 @@ install:
     - "powershell ci-helpers/appveyor/install-miniconda.ps1"
     - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
     - "activate test"
+    # HACK: Copy tiff.dll to libtiff.dll
+    - "cd %PYTHON%\\envs\\test\\Library\\bin"
+    - "copy tiff.dll libtiff.dll"
+    - "cd C:\\projects\\satpy"
 
 build: false  # Not a C# project, build stuff at the test step instead.
 

debian/README.Debian

-satpy for debian
-----------------
-
-Currently the Debian package for satpy does not provide any of
-the SatPy functionalities that require python-hdf4 (pyhdf) which
-is not available in Debian (Dec 2018).
-
-Affected modules are:
-
-* satpy.readers.hdf4_utils
-* satpy.readers.hdfeos_l1b
-* satpy.readers.clavrx
-* satpy.readers.viirs_flood

debian/changelog

-satpy (0.10.0-1) unstable; urgency=medium
+satpy (0.11.0-1) unstable; urgency=medium
 
   * Initial version (Closes: #917110)
 

debian/control

@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 11),
                python3-imageio,
                python3-libtiff (>= 0.4.2),
                python3-netcdf4,
-               python3-numpy,
+               python3-numpy (>= 1:1.13),
                python3-pil,
                python3-pygac,
                python3-pycoast,
@@ -49,7 +49,7 @@ Architecture: all
 Depends: python3-dask,
          python3-grib,
          python3-hdf4,
-         python3-numpy,
+         python3-numpy (>= 1:1.13),
          python3-pil,
          python3-pykdtree,
          python3-pyproj,

debian/patches/0001-Fix-pyhdf.patch

@@ -7,10 +7,10 @@ Subject: Fix pyhdf
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index 83542db..86d710e 100644
+index 257f955..7f7308f 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -36,7 +36,7 @@ requires = ['numpy >=1.12', 'pillow', 'pyresample >=1.10.3', 'trollsift',
+@@ -36,7 +36,7 @@ requires = ['numpy >=1.13', 'pillow', 'pyresample >=1.10.3', 'trollsift',
              'dask[array] >=0.17.1']
  
  # pyhdf (conda) == python-hdf4 (pip)

debian/patches/0003-Skip-tests-that-require-pydecorate.patch

+From: Antonio Valentino <antonio.valentino@tiscali.it>
+Date: Tue, 25 Dec 2018 19:27:25 +0000
+Subject: Skip tests that require pydecorate
+
+---
+ satpy/tests/test_writers.py | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/satpy/tests/test_writers.py b/satpy/tests/test_writers.py
+index 741776e..81bed45 100644
+--- a/satpy/tests/test_writers.py
++++ b/satpy/tests/test_writers.py
+@@ -36,6 +36,12 @@ except ImportError:
+     import mock
+ 
+ 
++try:
++    import pydecorate
++except ImportError:
++    pydecorate = False
++
++
+ def mkdir_p(path):
+     """Make directories."""
+     if not path or path == '.':
+@@ -549,6 +555,7 @@ class TestBaseWriter(unittest.TestCase):
+         self.assertTrue(os.path.isfile(os.path.join(self.base_dir, exp_fn)))
+ 
+ 
++@unittest.skipIf(not pydecorate, 'pydecorate not available')
+ class TestOverlays(unittest.TestCase):
+     """Tests for add_overlay and add_decorate functions."""
+ 

debian/patches/series

 0001-Fix-pyhdf.patch
 0002-Compatibility-with-Python-3.7.patch
+0003-Skip-tests-that-require-pydecorate.patch

doc/source/api/satpy.readers.rst

@@ -44,6 +44,22 @@ satpy.readers.amsr2\_l1b module
     :undoc-members:
     :show-inheritance:
 
+satpy.readers.avhrr\_l1b\_gaclac module
+---------------------------------------
+
+.. automodule:: satpy.readers.avhrr_l1b_gaclac
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+satpy.readers.caliop\_l2\_cloud module
+--------------------------------------
+
+.. automodule:: satpy.readers.caliop_l2_cloud
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 satpy.readers.clavrx module
 ---------------------------
 
@@ -52,6 +68,14 @@ satpy.readers.clavrx module
     :undoc-members:
     :show-inheritance:
 
+satpy.readers.electrol\_hrit module
+-----------------------------------
+
+.. automodule:: satpy.readers.electrol_hrit
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 satpy.readers.eps\_l1b module
 -----------------------------
 
@@ -68,10 +92,10 @@ satpy.readers.eum\_base module
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.fci\_fdhsi module
--------------------------------
+satpy.readers.fci\_l1c\_fdhsi module
+------------------------------------
 
-.. automodule:: satpy.readers.fci_fdhsi
+.. automodule:: satpy.readers.fci_l1c_fdhsi
     :members:
     :undoc-members:
     :show-inheritance:
@@ -84,14 +108,6 @@ satpy.readers.file\_handlers module
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.gac\_lac\_l1 module
----------------------------------
-
-.. automodule:: satpy.readers.gac_lac_l1
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 satpy.readers.generic\_image module
 -----------------------------------
 
@@ -108,50 +124,50 @@ satpy.readers.geocat module
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.ghrsst\_osisaf module
------------------------------------
+satpy.readers.ghrsst\_l3c\_sst module
+-------------------------------------
 
-.. automodule:: satpy.readers.ghrsst_osisaf
+.. automodule:: satpy.readers.ghrsst_l3c_sst
     :members:
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.grib module
--------------------------
+satpy.readers.goes\_imager\_hrit module
+---------------------------------------
 
-.. automodule:: satpy.readers.grib
+.. automodule:: satpy.readers.goes_imager_hrit
     :members:
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.hdf4\_caliopv3 module
------------------------------------
+satpy.readers.goes\_imager\_nc module
+-------------------------------------
 
-.. automodule:: satpy.readers.hdf4_caliopv3
+.. automodule:: satpy.readers.goes_imager_nc
     :members:
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.hdf4\_utils module
---------------------------------
+satpy.readers.grib module
+-------------------------
 
-.. automodule:: satpy.readers.hdf4_utils
+.. automodule:: satpy.readers.grib
     :members:
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.hdf5\_utils module
+satpy.readers.hdf4\_utils module
 --------------------------------
 
-.. automodule:: satpy.readers.hdf5_utils
+.. automodule:: satpy.readers.hdf4_utils
     :members:
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.hdfeos\_l1b module
+satpy.readers.hdf5\_utils module
 --------------------------------
 
-.. automodule:: satpy.readers.hdfeos_l1b
+.. automodule:: satpy.readers.hdf5_utils
     :members:
     :undoc-members:
     :show-inheritance:
@@ -164,22 +180,6 @@ satpy.readers.hrit\_base module
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.hrit\_electrol module
------------------------------------
-
-.. automodule:: satpy.readers.hrit_electrol
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-satpy.readers.hrit\_goes module
--------------------------------
-
-.. automodule:: satpy.readers.hrit_goes
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 satpy.readers.hrit\_jma module
 ------------------------------
 
@@ -188,14 +188,6 @@ satpy.readers.hrit\_jma module
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.hrit\_msg module
-------------------------------
-
-.. automodule:: satpy.readers.hrit_msg
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 satpy.readers.hrpt module
 -------------------------
 
@@ -228,106 +220,130 @@ satpy.readers.maia module
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.msg\_base module
-------------------------------
+satpy.readers.modis\_l1b module
+-------------------------------
 
-.. automodule:: satpy.readers.msg_base
+.. automodule:: satpy.readers.modis_l1b
     :members:
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.native\_msg module
---------------------------------
+satpy.readers.msi\_safe module
+------------------------------
 
-.. automodule:: satpy.readers.native_msg
+.. automodule:: satpy.readers.msi_safe
     :members:
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.native\_msg\_hdr module
--------------------------------------
+satpy.readers.netcdf\_utils module
+----------------------------------
 
-.. automodule:: satpy.readers.native_msg_hdr
+.. automodule:: satpy.readers.netcdf_utils
     :members:
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.nc\_nwcsaf module
--------------------------------
+satpy.readers.nucaps module
+---------------------------
 
-.. automodule:: satpy.readers.nc_nwcsaf
+.. automodule:: satpy.readers.nucaps
     :members:
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.nc\_nwcsaf\_msg module
-------------------------------------
+satpy.readers.nwcsaf\_nc module
+-------------------------------
 
-.. automodule:: satpy.readers.nc_nwcsaf_msg
+.. automodule:: satpy.readers.nwcsaf_nc
     :members:
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.nc\_olci module
+satpy.readers.olci\_nc module
 -----------------------------
 
-.. automodule:: satpy.readers.nc_olci
+.. automodule:: satpy.readers.olci_nc
     :members:
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.nc\_slstr module
+satpy.readers.omps\_edr module
 ------------------------------
 
-.. automodule:: satpy.readers.nc_slstr
+.. automodule:: satpy.readers.omps_edr
     :members:
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.netcdf\_utils module
+satpy.readers.sar\_c\_safe module
+---------------------------------
+
+.. automodule:: satpy.readers.sar_c_safe
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+satpy.readers.scatsat1\_l2b module
 ----------------------------------
 
-.. automodule:: satpy.readers.netcdf_utils
+.. automodule:: satpy.readers.scatsat1_l2b
     :members:
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.nucaps module
----------------------------
+satpy.readers.scmi module
+-------------------------
 
-.. automodule:: satpy.readers.nucaps
+.. automodule:: satpy.readers.scmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.omps\_edr module
-------------------------------
+satpy.readers.seviri\_base module
+---------------------------------
 
-.. automodule:: satpy.readers.omps_edr
+.. automodule:: satpy.readers.seviri_base
     :members:
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.safe\_msi module
-------------------------------
+satpy.readers.seviri\_l1b\_hrit module
+--------------------------------------
 
-.. automodule:: satpy.readers.safe_msi
+.. automodule:: satpy.readers.seviri_l1b_hrit
     :members:
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.safe\_sar\_c module
----------------------------------
+satpy.readers.seviri\_l1b\_native module
+----------------------------------------
 
-.. automodule:: satpy.readers.safe_sar_c
+.. automodule:: satpy.readers.seviri_l1b_native
     :members:
     :undoc-members:
     :show-inheritance:
 
-satpy.readers.scatsat1\_l2b module
-----------------------------------
+satpy.readers.seviri\_l1b\_native\_hdr module
+---------------------------------------------
 
-.. automodule:: satpy.readers.scatsat1_l2b
+.. automodule:: satpy.readers.seviri_l1b_native_hdr
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+satpy.readers.seviri\_l1b\_nc module
+------------------------------------
+
+.. automodule:: satpy.readers.seviri_l1b_nc
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+satpy.readers.slstr\_l1b module
+-------------------------------
+
+.. automodule:: satpy.readers.slstr_l1b
     :members:
     :undoc-members:
     :show-inheritance:

doc/source/conf.py

@@ -247,4 +247,5 @@ intersphinx_mapping = {
     'pyresample': ('https://pyresample.readthedocs.io/en/stable', None),
     'trollsift': ('https://trollsift.readthedocs.io/en/stable', None),
     'trollimage': ('https://trollimage.readthedocs.io/en/stable', None),
+    'pydecorate': ('https://pydecorate.readthedocs.io/en/stable', None),
 }

doc/source/dev_guide/custom_reader.rst

-.. _custom-reader:
-
 =================================
  Adding a Custom Reader to SatPy
 =================================
@@ -11,6 +9,56 @@ In order to add a reader to satpy, you will need to create two files:
 For this tutorial, we will implement a reader for the Eumetsat NetCDF
 format for SEVIRI data
 
+.. _reader_naming:
+
+Naming your reader
+------------------
+
+SatPy tries to follow a standard scheme for naming its readers. These names
+are used in filenames, but are also used by users so it is important that
+the name be recognizable and clear. Although some
+special cases exist, most fit in to the following naming scheme:
+
+.. parsed-literal::
+
+    <sensor>[_<processing level>[_<level detail>]][_<file format>]
+
+All components of the name should be lowercase and use underscores as the main
+separator between fields. Hyphens should be used as an intra-field separator
+if needed (ex. goes-imager).
+
+:sensor: The first component of the name represents the sensor or
+    instrument that observed the data stored in the files being read. If
+    the files are the output of a specific processing software or a certain
+    algorithm implementation that supports multiple sensors then a lowercase
+    version of that software's name should be used (e.g. clavrx for CLAVR-x,
+    nucaps for NUCAPS). The ``sensor`` field is the only required field of
+    the naming scheme. If it is actually an instrument name then the reader
+    name should include one of the other optional fields. If sensor is a
+    software package then that may be enough without any additional
+    information to uniquely identify the reader.
+:processing level: This field marks the specific level of processing or
+    calibration that has been performed to produce the data in the files being
+    read. Common values of this field include: ``sdr`` for Sensor Data
+    Record (SDR), ``edr`` for Environmental Data Record (EDR), ``l1b`` for
+    Level 1B, and ``l2`` for Level 2.
+:level detail: In cases where the processing level is not enough to completely
+    define the reader this field can be used to provide a little more context.
+    For example, some VIIRS EDR products are specific to a particular field
+    of study or type of scientific event, like a flood or cloud product. In
+    these cases the detail field can be added to produce a name like
+    ``viirs_edr_flood``. This field shouldn't be used unless processing level
+    is also specified.
+:file format: If the file format of the files is informative to the user or
+    can distinguish one reader from another then this field should be
+    specified. Common format names should be abbreviated following existing
+    abbreviations like `nc` for NetCDF3 or NetCDF4, `hdf` for HDF4, `h5` for
+    HDF5.
+
+The existing :ref:`reader's table <reader_table>` can be used for reference.
+When in doubt, reader names can be discussed in the github pull
+request when this reader is added to SatPy or a github issue.
+
 The YAML file
 -------------
 
@@ -26,11 +74,9 @@ The ``reader`` section, that provides basic parameters for the reader.
 
 The parameters to provide in this section are:
  - description: General description of the reader
- - name: this is the name of the reader, it
-   should be the same as the filename (without the .yaml extension
-   obviously). This is the name used interactively in satpy, so choose it
-   well! A loose convention is to use ``<format>_<instrument>_<level>`` as
-   a template for the name
+ - name: this is the name of the reader, it should be the same as the
+   filename (without the .yaml extension). The naming convention for
+   this is described above in the :ref:`reader_naming` section above.
  - sensors: the list of sensors this reader will support
  - reader: the metareader to use, in most cases the
    ``FileYAMLReader`` is a good choice.

doc/source/index.rst

@@ -53,77 +53,89 @@ installation.
     * - Description
       - Reader name
       - Status
-    * - MSG (Meteosat 8 to 11) Seviri data in HRIT format
-      - `hrit_msg`
+    * - MSG (Meteosat 8 to 11) SEVIRI data in HRIT format
+      - `seviri_l1b_hrit`
       - Nominal
     * - MSG (Meteosat 8 to 11) SEVIRI data in native format
-      - `native_msg`
-      - | No support for reading sub-section of the
-        | full disk. HRV data cannot be remapped.
+      - `seviri_l1b_native`
+      - HRV full disk data cannot be remapped.
+    * - MSG (Meteosat 8 to 11) SEVIRI data in netCDF format
+      - `seviri_l1b_nc`
+      - | HRV channel not supported, incomplete metadata
+        | in the files. EUMETSAT has been notified.
     * - Himawari 8 and 9 AHI data in HSD format
       - `ahi_hsd`
       - Nominal
     * - Himawari 8 and 9 AHI data in HRIT format
-      - `hrit_jma`
+      - `ahi_hrit`
       - Nominal
+    * - MTSAT-1R JAMI data in JMA HRIT format
+      - `jami_hrit`
+      - Beta
+    * - MTSAT-2 Imager data in JMA HRIT format
+      - `mtsat2-imager_hrit`
+      - Beta
     * - GOES 16 imager data in netcdf format
       - `abi_l1b`
       - Nominal
     * - GOES 11 to 15 imager data in HRIT format
-      - `hrit_goes`
+      - `goes-imager_hrit`
       - Nominal
     * - GOES 8 to 15 imager data in netCDF format (from NOAA CLASS)
-      - `nc_goes`
+      - `goes-imager_nc`
       - Beta
     * - Electro-L N2 MSU-GS data in HRIT format
-      - `hrit_electrol`
+      - `electrol_hrit`
       - Nominal
     * - NOAA 15 to 19, Metop A to C AVHRR data in AAPP format
-      - `avhrr_aapp_l1b`
+      - `avhrr_l1b_aapp`
       - Nominal
     * - Metop A to C AVHRR in native level 1 format
-      - `avhrr_eps_l1b`
+      - `avhrr_l1b_eps`
       - Nominal
     * - Tiros-N, NOAA 7 to 19 AVHRR data in GAC and LAC format
-      - `gac_lac_l1b`
+      - `avhrr_l1b_gaclac`
       - Nominal
     * - NOAA 15 to 19 AVHRR data in raw HRPT format
-      - `avhrr_hrpt_l1b`
+      - `avhrr_l1b_hrpt`
       - In development
     * - GCOM-W1 AMSR2 data in HDF5 format
       - `amsr2_l1b`
       - Nominal
-    * - MTG FCI data in netcdf format
-      - `fci_fdhsi`
+    * - MTG FCI Level 1C data for Full Disk High Spectral Imagery (FDHSI) in netcdf format
+      - `fci_l1c_fdhsi`
       - In development
-    * - Callipso Caliop data in EOS-hdf4 format
-      - `hdf4_caliopv3`
+    * - Callipso Caliop Level 2 Cloud Layer data (v3) in EOS-hdf4 format
+      - `caliop_l2_cloud`
       - In development
     * - Terra and Aqua MODIS data in EOS-hdf4 level-1 format as produced by IMAPP and IPOPP or downloaded from LAADS
-      - `hdfeos_l1b`
+      - `modis_l1b`
       - Nominal
-    * - NWCSAF GEO 2016 products in netCDF4 format
-      - `nc_nwcsaf_msg`
+    * - NWCSAF GEO 2016 products in netCDF4 format (limited to SEVIRI)
+      - `nwcsaf-geo`
       - In development
     * - NWCSAF PPS 2014, 2018 products in netCDF4 format
-      - `nc_nwcsaf_pps`
+      - `nwcsaf-pps_nc`
       - | Not yet support for remapped netCDF products.
         | Only the standard swath based output is supported.
         | CPP products not supported yet
     * - Sentinel-1 A and B SAR-C data in SAFE format
-      - `safe_sar_c`
+      - `sar-c_safe`
       - Nominal
     * - Sentinel-2 A and B MSI data in SAFE format
-      - `safe_msi`
+      - `msi_safe`
       - Nominal
-    * - Sentinel-3 A and B OLCI data in netCDF4 format
-      - `nc_olci`
+    * - Sentinel-3 A and B OLCI Level 1B data in netCDF4 format
+      - `olci_l1b`
+      - Nominal
+    * - Sentinel-3 A and B OLCI Level 2 data in netCDF4 format
+      - `olci_l2`
       - Nominal
     * - Sentinel-3 A and B SLSTR data in netCDF4 format
-      - `nc_slstr`
+      - `slstr_l1b`
       - In development
     * - OSISAF SST data in GHRSST (netcdf) format
-      - `ghrsst_osisaf`
+      - `ghrsst_l3c_sst`
       - In development
     * - NUCAPS EDR Retrieval in NetCDF4 format
       - `nucaps`
@@ -137,13 +149,13 @@ installation.
     * - The Clouds from AVHRR Extended (CLAVR-x)
       - `clavrx`
       - Nominal
-    * - SNPP VIIRS data in hdf5 SDR format
+    * - SNPP VIIRS data in HDF5 SDR format
       - `viirs_sdr`
       - Nominal
     * - SNPP VIIRS data in netCDF4 L1B format
-      - `viirs_sdr`
+      - `viirs_l1b`
       - Nominal
-    * - SNPP VIIRS data in hdf5 Compact format
+    * - SNPP VIIRS SDR data in HDF5 Compact format
       - `viirs_compact`
       - Nominal
     * - AAPP MAIA VIIRS and AVHRR products in hdf5 format
@@ -156,7 +168,7 @@ installation.
       - `grib`
       - Beta
     * - SCMI ABI L1B format
-      - `scmi_abi_l1b`
+      - `abi_l1b_scmi`
       - Beta
 
 Indices and tables

doc/source/quickstart.rst

@@ -20,7 +20,7 @@ Scene must be told what files to read and what
     >>> from satpy import Scene
     >>> from glob import glob
     >>> filenames = glob("/home/a001673/data/satellite/Meteosat-10/seviri/lvl1.5/2015/04/20/HRIT/*201504201000*")
-    >>> global_scene = Scene(reader="hrit_msg", filenames=filenames)
+    >>> global_scene = Scene(reader="seviri_l1b_hrit", filenames=filenames)
 
 To load data from the files use the :meth:`Scene.load <satpy.scene.Scene.load>`
 method. Printing the Scene object will list each of the

doc/source/readers.rst

@@ -35,7 +35,7 @@ is created requesting datasets by `name` or `wavelength` is all that is
 needed::
 
     >>> from satpy import Scene
-    >>> scn = Scene(reader="hrit_msg", filenames=filenames)
+    >>> scn = Scene(reader="seviri_l1b_hrit", filenames=filenames)
     >>> scn.load([0.6, 0.8, 10.8])
     >>> scn.load(['IR_120', 'IR_134'])
 
@@ -112,7 +112,7 @@ more information on the possible parameters.
 Adding a Reader to SatPy
 ========================
 
-This is described in the developer guide, see :ref:`custom-reader`
+This is described in the developer guide, see :doc:`dev_guide/custom_reader`.
 
 Implemented readers
 ===================
@@ -122,11 +122,11 @@ xRIT-based readers
 
 .. automodule:: satpy.readers.hrit_base
 
-.. automodule:: satpy.readers.hrit_msg
+.. automodule:: satpy.readers.seviri_l1b_hrit
 
 .. automodule:: satpy.readers.hrit_jma
 
-.. automodule:: satpy.readers.hrit_goes
+.. automodule:: satpy.readers.goes_imager_hrit
 
-.. automodule:: satpy.readers.hrit_electrol
+.. automodule:: satpy.readers.electrol_hrit
 

satpy-env_np111py27.yml

-name: satpy-env
-channels:
-- !!python/unicode
-  'defaults'
-- !!python/unicode
-  'conda-forge'
-dependencies:
-- !!python/unicode
-  'pykdtree=1.2.1=np111py27_0'
-- !!python/unicode
-  'configobj=5.0.6=py27_0'
-- !!python/unicode
-  'curl=7.45.0=0'
-- !!python/unicode
-  'freetype=2.5.5=2'
-- !!python/unicode
-  'gdal=2.0.0=py27_1'
-- !!python/unicode
-  'geos=3.4.2=0'
-- !!python/unicode
-  'geotiff=1.4.1=0'
-- !!python/unicode
-  'h5py=2.6.0=np111py27_0'
-- !!python/unicode
-  'hdf4=4.2.11=0'
-- !!python/unicode
-  'hdf5=1.8.15.1=3'
-- !!python/unicode
-  'jbig=2.1=0'
-- !!python/unicode
-  'jpeg=9b=0'
-- !!python/unicode
-  'kealib=1.4.5=0'
-- !!python/unicode
-  'libgcc=5.2.0=0'
-- !!python/unicode
-  'libgdal=2.0.0=1'
-- !!python/unicode
-  'libnetcdf=4.3.3.1=3'
-- !!python/unicode
-  'libpng=1.6.27=0'
-- !!python/unicode
-  'libtiff=4.0.6=3'
-- !!python/unicode
-  'mkl=2017.0.1=0'
-- !!python/unicode
-  'netcdf4=1.2.2=np111py27_0'
-- !!python/unicode
-  'numpy=1.11.3=py27_0'
-- !!python/unicode
-  'olefile=0.44=py27_0'
-- !!python/unicode
-  'openssl=1.0.2k=1'
-- !!python/unicode
-  'pillow=4.0.0=py27_1'
-- !!python/unicode
-  'pip=9.0.1=py27_1'
-- !!python/unicode
-  'proj4=4.9.2=0'
-- !!python/unicode
-  'pyproj=1.9.5.1=py27_0'
-- !!python/unicode
-  'python=2.7.13=0'
-- !!python/unicode
-  'pyyaml=3.12=py27_0'
-- !!python/unicode
-  'readline=6.2=2'
-- !!python/unicode
-  'setuptools=27.2.0=py27_0'
-- !!python/unicode
-  'six=1.10.0=py27_0'
-- !!python/unicode
-  'sqlite=3.13.0=0'
-- !!python/unicode
-  'tk=8.5.18=0'
-- !!python/unicode
-  'wheel=0.29.0=py27_0'
-- !!python/unicode
-  'xerces-c=3.1.4=0'
-- !!python/unicode
-  'xz=5.2.2=1'
-- !!python/unicode
-  'yaml=0.1.6=0'
-- !!python/unicode
-  'zlib=1.2.8=3'
-- pip:
-  - pyresample==1.3.1
-  - satpy==0.5.0
-  - trollimage==1.0.2
-  - trollsift==0.2.0
-

satpy/composites/abi.py

@@ -23,7 +23,7 @@
 """
 
 import logging
-from satpy.composites import GenericCompositor, IncompatibleAreas
+from satpy.composites import GenericCompositor
 
 LOG = logging.getLogger(__name__)