Fixed conflict

.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,4 @@ 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)

CHANGELOG.md

@@ -1,3 +1,52 @@
+## Version 0.13.0 (2019/03/18)
+
+### Issues Closed
+
+* [Issue 641](https://github.com/pytroll/satpy/issues/641) - After pip upgrade to satpy 0.12 and pyproj 2.0.1 got pyproj.exceptions.CRSError
+* [Issue 626](https://github.com/pytroll/satpy/issues/626) - Issue loading MODIS Aqua data ([PR 648](https://github.com/pytroll/satpy/pull/648))
+* [Issue 620](https://github.com/pytroll/satpy/issues/620) - Add FAQ about controlling number of threads for pykdtree and blas ([PR 621](https://github.com/pytroll/satpy/pull/621))
+* [Issue 521](https://github.com/pytroll/satpy/issues/521) - Interactively set the Calibration Mode when creating the Scene Object ([PR 543](https://github.com/pytroll/satpy/pull/543))
+
+In this release 4 issues were closed.
+
+### Pull Requests Merged
+
+#### Bugs fixed
+
+* [PR 664](https://github.com/pytroll/satpy/pull/664) - Fix Scene.crop with RGBs and multidimensional data
+* [PR 662](https://github.com/pytroll/satpy/pull/662) - Fix masked resampling when dataset dtype is integer
+* [PR 661](https://github.com/pytroll/satpy/pull/661) - Fix CTTH composite not to mark invalid data as cloud-free
+* [PR 660](https://github.com/pytroll/satpy/pull/660) - Fix seviri_l1b_hrit prologue/epilogue readers
+* [PR 655](https://github.com/pytroll/satpy/pull/655) - Fix yaml load to be compatible with pyyaml 5.1
+* [PR 652](https://github.com/pytroll/satpy/pull/652) - Fix resampling of ancillary variables when also first class datasets
+* [PR 648](https://github.com/pytroll/satpy/pull/648) - Add wrapped line support for metadata in modis_l1b reader ([626](https://github.com/pytroll/satpy/issues/626))
+* [PR 644](https://github.com/pytroll/satpy/pull/644) - Fix the modis overview not to sun normalize the IR channel
+* [PR 633](https://github.com/pytroll/satpy/pull/633) - Fix VIIRS HNCC composite passing xarray objects to dask
+* [PR 632](https://github.com/pytroll/satpy/pull/632) - Fixing start and end times when missing in the CF writer
+
+#### Features added
+
+* [PR 647](https://github.com/pytroll/satpy/pull/647) - Switch python-hdf4 dependencies to pyhdf
+* [PR 643](https://github.com/pytroll/satpy/pull/643) - In cira_strech clip values less or equal to 0 to avoid nans and -inf.
+* [PR 642](https://github.com/pytroll/satpy/pull/642) - Bugfix pps2018 cpp products
+* [PR 638](https://github.com/pytroll/satpy/pull/638) - Add processing-mode and disposition-mode to the avhrr-l1b-eps file name
+* [PR 636](https://github.com/pytroll/satpy/pull/636) - Facilitate selection of calibration coefficients in seviri_l1b_hrit
+* [PR 635](https://github.com/pytroll/satpy/pull/635) - Add local caching of slicing for data reduction
+* [PR 627](https://github.com/pytroll/satpy/pull/627) - Add DNB satellite angles (DNB_SENZ, DNB_SENA) to VIIRS SDR reader
+* [PR 557](https://github.com/pytroll/satpy/pull/557) - Improve the SAR-C reading and Ice composite
+* [PR 543](https://github.com/pytroll/satpy/pull/543) - Calibration mode can now be passed via a keyword argument ([521](https://github.com/pytroll/satpy/issues/521))
+* [PR 538](https://github.com/pytroll/satpy/pull/538) - Support CLASS packed viirs files in viirs_sdr reader
+
+#### Documentation changes
+
+* [PR 659](https://github.com/pytroll/satpy/pull/659) - DOC: Refer to PyTroll coding guidelines
+* [PR 653](https://github.com/pytroll/satpy/pull/653) - DOC: Fix small typos in documentation
+* [PR 651](https://github.com/pytroll/satpy/pull/651) - Rename changelog for releases before 0.9.0
+* [PR 621](https://github.com/pytroll/satpy/pull/621) - Add FAQ items on number of workers and threads ([620](https://github.com/pytroll/satpy/issues/620))
+
+In this release 24 pull requests were closed.
+
+
 ## Version 0.12.0 (2019/02/15)
 
 ### Issues Closed

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,4 +1,4 @@
-# Releasing SatPy
+# Releasing Satpy
 
 1. checkout master
 2. pull from repo

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

doc/source/conf.py

@@ -75,7 +75,7 @@ def __getattr__(cls, name):
 master_doc = 'index'
 
 # General information about the project.
-project = u'SatPy'
+project = u'Satpy'
 copyright = u'2009-{}, The PyTroll Team'.format(datetime.utcnow().strftime("%Y"))
 
 # The version info for the project you're documenting, acts as replacement for

doc/source/data_download.rst

@@ -1,9 +1,9 @@
 Downloading Data
 ================
 
-One of the main features of SatPy is its ability to read various satellite
+One of the main features of Satpy is its ability to read various satellite
 data formats. However, it does not currently provide any functionality for
-downloading data from any remote sources. SatPy assumes all data is available
+downloading data from any remote sources. Satpy assumes all data is available
 through the local system, either as a local directory or network
 mounted file systems. Certain readers that use ``xarray`` to open data files
 may be able to load files from remote systems by using OpenDAP or similar
@@ -22,7 +22,7 @@ satellite mission organization (NOAA, NASA, EUMETSAT, etc). In these cases
 data is usually available as a mounted network file system and can be accessed
 like a normal local path (with the added latency of network communications).
 
-Below are some data sources that provide data that can be read by SatPy. If
+Below are some data sources that provide data that can be read by Satpy. If
 you know of others please let us know by either creating a GitHub issue or
 pull request.
 

doc/source/dev_guide/custom_reader.rst

@@ -1,5 +1,5 @@
 =================================
- Adding a Custom Reader to SatPy
+ Adding a Custom Reader to Satpy
 =================================
 
 In order to add a reader to satpy, you will need to create two files:
@@ -14,7 +14,7 @@ format for SEVIRI data
 Naming your reader
 ------------------
 
-SatPy tries to follow a standard scheme for naming its readers. These names
+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:
@@ -57,7 +57,7 @@ if needed (ex. goes-imager).
 
 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.
+request when this reader is added to Satpy or a github issue.
 
 The YAML file
 -------------

doc/source/dev_guide/index.rst

@@ -18,22 +18,19 @@ at the pages listed below.
 Coding guidelines
 =================
 
-SatPy tries to follow
-`PEP8 <https://www.python.org/dev/peps/pep-0008/>`_ style guidelines for
-all of its python code. We also try to limit lines of code to 80 characters
-whenever possible and when it doesn't 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.
-
-SatPy currently supports Python 2.7 and 3.4+. All code should be written to
+Satpy is part of `PyTroll <http://pytroll.github.io/>`_,
+and all code should follow the
+`PyTroll coding guidelines and best
+practices <http://pytroll.github.io/guidelines.html>`_.
+
+Satpy currently supports Python 2.7 and 3.4+. All code should be written to
 be compatible with these versions.
 
 Development installation
 ========================
 
 See the :doc:`../install` section for basic installation instructions. When
-it comes time to install SatPy it should be installed from a clone of the git
+it comes time to install Satpy it should be installed from a clone of the git
 repository and in development mode so that local file changes are
 automatically reflected in the python environment. We highly recommend making
 a separate conda environment or virtualenv for development.
@@ -47,15 +44,15 @@ clone your fork. The package can then be installed in development by doing::
 Running tests
 =============
 
-SatPy tests are written using the python :mod:`unittest` module and the tests
+Satpy tests are written using the python :mod:`unittest` module and the tests
 can be executed by running::
 
     python setup.py test
 
 Documentation
 =============
 
-SatPy's documentation is built using Sphinx. All documentation lives in the
+Satpy's documentation is built using Sphinx. All documentation lives in the
 ``doc/`` directory of the project repository. After editing the source files
 there the documentation can be generated locally::