Bring my fork up to date with the main repo

.github/ISSUE_TEMPLATE/bug_report.md

@@ -26,7 +26,7 @@ If applicable, add screenshots to help explain your problem.
 
 **Environment Info:**
  - OS: [e.g. OSX, Windows, Linux]
- - SatPy Version: [e.g. 0.9.0]
+ - Satpy Version: [e.g. 0.9.0]
  - PyResample Version:
  - Readers and writers dependencies (when relevant): [run `from satpy.config import check_satpy; check_satpy()`]
 

.gitignore

@@ -63,3 +63,4 @@ nosetests.xml
 
 # vi / vim swp files
 *.swp
+.DS_STORE

AUTHORS.md

@@ -33,3 +33,5 @@ The following people have made contributions to this project:
 - [sjoro (sjoro)](https://github.com/sjoro)
 - Guido della Bruna - meteoswiss
 - Marco Sassi - meteoswiss
+- [Rohan Daruwala (rdaruwala)](https://github.com/rdaruwala)
+- [Simon R. Proud (simonrp84)](https://github.com/simonrp84)

CONTRIBUTING.rst

@@ -2,15 +2,15 @@
 How to contribute
 =================
 
-Thank you for considering contributing to SatPy! SatPy's development team
+Thank you for considering contributing to Satpy! Satpy's development team
 is made up of volunteers so any help we can get is very appreciated.
 
 Contributions from users are what keep this community going. We welcome
 any contributions including bug reports, documentation fixes or updates,
-bug fixes, and feature requests. By contributing to SatPy you are providing
+bug fixes, and feature requests. By contributing to Satpy you are providing
 code that everyone can use and benefit from.
 
-The following guidelines will describe how the SatPy project structures
+The following guidelines will describe how the Satpy project structures
 its code contributions from discussion to code to package release.
 
 For more information on contributing to open source projects see
@@ -39,7 +39,7 @@ What can I do?
 - Read the :doc:`index` for more details on contributing code.
 - `Fork <https://help.github.com/articles/fork-a-repo/>`_ the repository on
   GitHub and install the package in development mode.
-- Update the SatPy documentation to make it clearer and more detailed.
+- Update the Satpy documentation to make it clearer and more detailed.
 - Contribute code to either fix a bug or add functionality and submit a
   `Pull Request <https://help.github.com/articles/creating-a-pull-request/>`_.
 - Make an example Jupyter Notebook and add it to the
@@ -53,33 +53,33 @@ fault. When you submit your changes to be merged as a GitHub
 `Pull Request <https://help.github.com/articles/creating-a-pull-request/>`_
 they will be automatically tested and checked against coding style rules.
 Before they are merged they are reviewed by at least one maintainer of the
-SatPy project. If anything needs updating, we'll let you know.
+Satpy project. If anything needs updating, we'll let you know.
 
 What is expected?
 =================
 
-You can expect the SatPy maintainers to help you. We are all volunteers,
+You can expect the Satpy maintainers to help you. We are all volunteers,
 have jobs, and occasionally go on vacations. We will try our best to answer
 your questions as soon as possible. We will try our best to understand your
 use case and add the features you need. Although we strive to make
-SatPy useful for everyone there may be some feature requests that we can't
+Satpy useful for everyone there may be some feature requests that we can't
 allow if they would require breaking existing features. Other features may
 be best for a different package, PyTroll or otherwise. Regardless, we will
 help you find the best place for your feature and to make it possible to do
 what you want.
 
-We, the SatPy maintainers, expect you to be patient, understanding, and
-respectful of both developers and users. SatPy can only be successful if
+We, the Satpy maintainers, expect you to be patient, understanding, and
+respectful of both developers and users. Satpy can only be successful if
 everyone in the community feels welcome. We also expect you to put in as
-much work as you expect out of us. There is no dedicated PyTroll or SatPy
+much work as you expect out of us. There is no dedicated PyTroll or Satpy
 support team, so there may be times when you need to do most of the work
 to solve your problem (trying different test cases, environments, etc).
 
 Being respectful includes following the style of the existing code for any
 code submissions. Please follow
 `PEP8 <https://www.python.org/dev/peps/pep-0008/>`_ style guidelines and
 limit lines of code to 80 characters whenever possible and when it doesn't
-hurt readability. SatPy follows
+hurt readability. Satpy follows
 `Google Style Docstrings <http://sphinxcontrib-napoleon.readthedocs.io/en/latest/example_google.html>`_
 for all code API documentation. When in doubt use the existing code as a
 guide for how coding should be done.
@@ -89,7 +89,7 @@ guide for how coding should be done.
 How do I get help?
 ==================
 
-The SatPy developers (and all other PyTroll package developers) monitor the:
+The Satpy developers (and all other PyTroll package developers) monitor the:
 
 - `Mailing List <https://groups.google.com/group/pytroll>`_
 - `Slack chat <https://pytroll.slack.com/>`_ (get an `invitation <https://pytrollslackin.herokuapp.com/>`_)
@@ -99,17 +99,17 @@ How do I submit my changes?
 ===========================
 
 Any contributions should start with some form of communication (see above) to
-let the SatPy maintainers know how you plan to help. The larger the
+let the Satpy maintainers know how you plan to help. The larger the
 contribution the more important direct communication is so everyone can avoid
 duplicate code and wasted time.
-After talking to the SatPy developers any additional work like code or
+After talking to the Satpy developers any additional work like code or
 documentation changes can be provided as a GitHub
 `Pull Request <https://help.github.com/articles/creating-a-pull-request/>`_.
 
 Code of Conduct
 ===============
 
-SatPy follows the same code of conduct as the PyTroll project. For reference
+Satpy follows the same code of conduct as the PyTroll project. For reference
 it is copied to this repository in
 `CODE_OF_CONDUCT.md <https://github.com/pytroll/satpy/blob/master/CODE_OF_CONDUCT.md>`_.
 

README.rst

@@ -14,9 +14,9 @@ Satpy
     :target: https://badge.fury.io/py/satpy
 
 
-The SatPy package is a python library for reading and manipulating
+The Satpy package is a python library for reading and manipulating
 meteorological remote sensing data and writing it to various image and
-data file formats. SatPy comes with the ability to make various RGB
+data file formats. Satpy comes with the ability to make various RGB
 composites directly from satellite instrument channel data or higher level
 processing output. The
 `pyresample <http://pyresample.readthedocs.io/en/latest/>`_ package is used
@@ -28,7 +28,7 @@ http://satpy.readthedocs.org/.
 Installation
 ------------
 
-SatPy can be installed from PyPI with pip:
+Satpy can be installed from PyPI with pip:
 
 .. code-block:: bash
 
@@ -44,7 +44,7 @@ It is also available from `conda-forge` for conda installations:
 Code of Conduct
 ---------------
 
-SatPy follows the same code of conduct as the PyTroll project. For reference
+Satpy follows the same code of conduct as the PyTroll project. For reference
 it is copied to this repository in CODE_OF_CONDUCT.md_.
 
 As stated in the PyTroll home page, this code of conduct applies to the

RELEASING.md

@@ -1,24 +1,36 @@
-# Releasing SatPy
+# Releasing Satpy
 
 1. checkout master
 2. pull from repo
 3. run the unittests
-4. run `loghub` and update the `CHANGELOG.md` file:
+4. run `loghub`.  Replace <github username> and <previous version> with proper
+   values.  To get the previous version run `git tag` and select the most
+   recent with highest version number.
 
 ```
-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"
+loghub pytroll/satpy -u <github username> -st v<previous version> -plg bug "Bugs fixed" -plg enhancement "Features added" -plg documentation "Documentation changes" -plg backwards-incompatibility "Backwards incompatible changes"
 ```
 
-Don't forget to commit!
+This command will create a CHANGELOG.temp file which need to be added
+to the top of the CHANGLOG.md file.  The same content is also printed
+to terminal, so that can be copy-pasted, too.  Remember to update also
+the version number to the same given in step 5. Don't forget to commit
+CHANGELOG.md!
 
 5. Create a tag with the new version number, starting with a 'v', eg:
 
 ```
-git tag -a v0.22.45 -m "Version 0.22.45"
+git tag -a v<new version> -m "Version <new version>"
 ```
 
-See [semver.org](http://semver.org/) on how to write a version number.
+For example if the previous tag was `v0.9.0` and the new release is a
+patch release, do:
 
+```
+git tag -a v0.9.1 -m "Version 0.9.1"
+```
+
+See [semver.org](http://semver.org/) on how to write a version number.
 
 
 6. push changes to github `git push --follow-tags`

doc/README

@@ -4,7 +4,7 @@ by running:
     make html
 
 The generated HTML documentation pages are available in `build/html`. If
-SatPy's API has changed (new functions, modules, classes, etc) then the
+Satpy's API has changed (new functions, modules, classes, etc) then the
 API documentation should be regenerated before running the above make
 command.
 

doc/source/api/satpy.demo.rst

@@ -0,0 +1,22 @@
+satpy.demo package
+==================
+
+Submodules
+----------
+
+satpy.demo.google\_cloud\_platform module
+-----------------------------------------
+
+.. automodule:: satpy.demo.google_cloud_platform
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: satpy.demo
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/source/api/satpy.readers.rst

@@ -364,6 +364,14 @@ satpy.readers.viirs\_compact module
     :undoc-members:
     :show-inheritance:
 
+satpy.readers.viirs\_edr\_active\_fires module
+--------------------------------------
+
+.. automodule:: satpy.readers.viirs_edr_active_fires
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 satpy.readers.viirs\_edr\_flood module
 --------------------------------------
 

doc/source/api/satpy.rst

@@ -7,6 +7,7 @@ Subpackages
 .. toctree::
 
     satpy.composites
+    satpy.demo
     satpy.enhancements
     satpy.readers
     satpy.writers