Skip to content
Commits on Source (8)
Show whitespace changes
Inline Side-by-side
.github/ISSUE_TEMPLATE/bug_report.md
View file @ 211d64e8
......@@ -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()`]
......
.github/ISSUE_TEMPLATE/feature_request.md
View file @ 211d64e8
......@@ -4,6 +4,8 @@ about: Suggest an idea for this project
---
## Feature Request
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
......@@ -11,16 +13,7 @@ A clear and concise description of what the problem is. Ex. I'm always frustrate
A clear and concise description of what you want to happen.
**Describe any changes to existing user workflow**
Are there any backwards compatibility concerns?
**Additional python or other dependencies**
Are any new packages required to implement this feature? Are they available on PyPI and conda-forge?
**Describe any changes required to the build process**
Does this feature require new C/C++ extensions or additional bundled data files?
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
Are there any backwards compatibility concerns? Changes to the build process? Additional dependencies?
**Additional context**
Add any other context or screenshots about the feature request here.
Have you considered any alternative solutions or is there anything else that would help describe your request.
.gitignore
View file @ 211d64e8
......@@ -63,3 +63,4 @@ nosetests.xml
# vi / vim swp files
*.swp
.DS_STORE
.travis.yml
View file @ 211d64e8
......@@ -37,7 +37,7 @@ deploy:
user: dhoese
password:
secure: frK+0k1STeTM7SizRseP0qdTfOVz9ZMIra+3qEytPdxCLceXAH8LxPU16zj5rdNQxasF1hZ6rAd952fly+ypw2TEf5r2WnStrt7G5QlyE7VB6XGSDpIUxKF1FYccLvYs0/R6Y35MTEPqdM51PM5yEBjoY5b4tA3RF3fDq11cqc/SiWr6DgSLB1WJZULOdtCzBbfGbm5LyJ7yeNbISASSAwVvZTGWw7kJDgi0W5zxwEX82N5tBGbfKIu59qmxyj8FxmcrUwKZ4P3rQNg1kN1utzAB+PSf3GAVvbZfWJQuAKwMqpZgaV9lX0V7eUd/AxPobzEk9WyoNBMIdrSPej5BKWTDiYvaeRTOsggoUCSQJJA/SITEvkJgLWXoKKX2OWrM8RBUO4MoZJpPGXN42PRtMJkV2sx6ZigkpJlHdn39SsIRZX31zsfv8bBhclb70bt1Ts0fDd0rVdZAI6gMI+sgUePwEUn+XbWrvI0sMfDX3QsXDMV393RHgaIPxd+lRqUlYsNOxjsWpsbsvX55ePLxYHsNrv11KKyL/iGjGotVeVUO5D78qvfd4JrsUnMalQyZfW8NTEKa5Ebcs7gYJTwYEOTCQU12BkHOv1zFkjZG5RdGwkEvG3pykLhx+qDyYEd7pKB3TvhzLPqZPSrPxirwcoc0UzCc6ocYdzpqVuViFuk=
distributions: sdist bdist_wheel
distributions: sdist
skip_existing: true
on:
tags: true
......
AUTHORS.md
View file @ 211d64e8
......@@ -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)
CHANGELOG.md
View file @ 211d64e8
## Version 0.14.1 (2019/04/12)
### Issues Closed
* [Issue 716](https://github.com/pytroll/satpy/issues/716) - Reading the EUMETSAT compact viirs format returns wrong platform name (J01 instead of NOAA-20) ([PR 717](https://github.com/pytroll/satpy/pull/717))
* [Issue 710](https://github.com/pytroll/satpy/issues/710) - Question (maybe a bug): Why does RBG array exported with scn.save_dataset contain values greater than 255 ?
In this release 2 issues were closed.
### Pull Requests Merged
#### Bugs fixed
* [PR 721](https://github.com/pytroll/satpy/pull/721) - Consistent platform id attribute across NAT + HRIT SEVIRI readers
* [PR 719](https://github.com/pytroll/satpy/pull/719) - Fix VIIRS 'night_fog' RGB composite recipe to use M12 instead of M14
* [PR 718](https://github.com/pytroll/satpy/pull/718) - Fix 'seviri_l1b_hrit' reader's area creation for pyproj 2.0+
* [PR 717](https://github.com/pytroll/satpy/pull/717) - Fix 'viirs_compact' and 'viirs_l1b' readers to return WMO/Oscar platform name ([716](https://github.com/pytroll/satpy/issues/716))
* [PR 715](https://github.com/pytroll/satpy/pull/715) - Fix hurricane florence demo download to only include M1 files
* [PR 712](https://github.com/pytroll/satpy/pull/712) - Fix 'mitiff' writer not clipping enhanced data before scaling to 8 bit values
* [PR 709](https://github.com/pytroll/satpy/pull/709) - Fix datetime64 use in 'seviri_l1b_hrit' reader for numpy < 1.15
* [PR 708](https://github.com/pytroll/satpy/pull/708) - Fix 'seviri_0deg' and 'seviri_iodc' builtin areas (areas.yaml) not matching reader areas
#### Documentation changes
* [PR 713](https://github.com/pytroll/satpy/pull/713) - Add links to source from API documentation
In this release 9 pull requests were closed.
## Version 0.14.0 (2019/04/09)
### Issues Closed
* [Issue 698](https://github.com/pytroll/satpy/issues/698) - Read WKT geotiff
* [Issue 692](https://github.com/pytroll/satpy/issues/692) - sdr_viirs_l1b reader fails in 0.13, recent master, Works with version 0.12.0 ([PR 693](https://github.com/pytroll/satpy/pull/693))
* [Issue 683](https://github.com/pytroll/satpy/issues/683) - Question: Change image size when saving with satpy.save_dataset ([PR 691](https://github.com/pytroll/satpy/pull/691))
* [Issue 681](https://github.com/pytroll/satpy/issues/681) - incorrect data offset in HSD files ([PR 689](https://github.com/pytroll/satpy/pull/689))
* [Issue 666](https://github.com/pytroll/satpy/issues/666) - Add drawing of lat lon graticules when saving dataset ([PR 668](https://github.com/pytroll/satpy/pull/668))
* [Issue 646](https://github.com/pytroll/satpy/issues/646) - Add 'demo' subpackage for accessing example data ([PR 686](https://github.com/pytroll/satpy/pull/686))
* [Issue 528](https://github.com/pytroll/satpy/issues/528) - Support dask version of PySpectral ([PR 529](https://github.com/pytroll/satpy/pull/529))
* [Issue 511](https://github.com/pytroll/satpy/issues/511) - Add/update documentation about composites and compositors ([PR 705](https://github.com/pytroll/satpy/pull/705))
In this release 8 issues were closed.
### Pull Requests Merged
#### Bugs fixed
* [PR 700](https://github.com/pytroll/satpy/pull/700) - Mask out invalid values in the precipitation probability product
* [PR 693](https://github.com/pytroll/satpy/pull/693) - Fix VIIRS SDR reading of visible channels at nighttime ([692](https://github.com/pytroll/satpy/issues/692))
* [PR 689](https://github.com/pytroll/satpy/pull/689) - Fix Himawari HSD reader's incorrect header information ([681](https://github.com/pytroll/satpy/issues/681))
* [PR 688](https://github.com/pytroll/satpy/pull/688) - Fix offset correction in seviri_l1b_hrit
* [PR 685](https://github.com/pytroll/satpy/pull/685) - Fix bug in Scene.resample causing AssertionError
* [PR 677](https://github.com/pytroll/satpy/pull/677) - Fix MultiScene save_animation when distributed isn't installed
* [PR 675](https://github.com/pytroll/satpy/pull/675) - Do not pass `filter_parameters` to the filehandler creation
#### Features added
* [PR 691](https://github.com/pytroll/satpy/pull/691) - Add Scene.aggregate method (python 3 only) ([683](https://github.com/pytroll/satpy/issues/683))
* [PR 686](https://github.com/pytroll/satpy/pull/686) - Add demo subpackage to simplify test data download ([646](https://github.com/pytroll/satpy/issues/646))
* [PR 676](https://github.com/pytroll/satpy/pull/676) - Feature add nightfog modis
* [PR 674](https://github.com/pytroll/satpy/pull/674) - Use platform ID to choose the right reader for AVHRR GAC data
* [PR 671](https://github.com/pytroll/satpy/pull/671) - Add satellite position to dataset attributes (seviri_l1b_hrit)
* [PR 669](https://github.com/pytroll/satpy/pull/669) - Add ocean-color for viirs and modis
* [PR 668](https://github.com/pytroll/satpy/pull/668) - Add grid/graticules to add_overlay function. ([666](https://github.com/pytroll/satpy/issues/666))
* [PR 665](https://github.com/pytroll/satpy/pull/665) - Add reader for VIIRS Active Fires
* [PR 645](https://github.com/pytroll/satpy/pull/645) - Reader for the SAR OCN L2 wind product in SAFE format.
* [PR 565](https://github.com/pytroll/satpy/pull/565) - Add reader for FY-3 VIRR (virr_l1b)
* [PR 529](https://github.com/pytroll/satpy/pull/529) - Add dask support to NIRReflectance modifier ([528](https://github.com/pytroll/satpy/issues/528))
#### Documentation changes
* [PR 707](https://github.com/pytroll/satpy/pull/707) - Add ABI Meso demo data case and clean up documentation
* [PR 705](https://github.com/pytroll/satpy/pull/705) - Document composites ([511](https://github.com/pytroll/satpy/issues/511))
* [PR 701](https://github.com/pytroll/satpy/pull/701) - Clarify release instructions
* [PR 699](https://github.com/pytroll/satpy/pull/699) - Rename SatPy to Satpy throughout documentation
* [PR 673](https://github.com/pytroll/satpy/pull/673) - Add information about GDAL_CACHEMAX to FAQ
In this release 23 pull requests were closed.
## 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
View file @ 211d64e8
......@@ -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,25 +53,25 @@ 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).
......@@ -79,7 +79,7 @@ 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
View file @ 211d64e8
......@@ -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
View file @ 211d64e8
# 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`
......
appveyor.yml
View file @ 211d64e8
......@@ -8,11 +8,6 @@ environment:
CONDA_CHANNELS: "conda-forge"
matrix:
- PYTHON: "C:\\Python27_64"
PYTHON_VERSION: "2.7"
PYTHON_ARCH: "64"
NUMPY_VERSION: "stable"
- PYTHON: "C:\\Python36_64"
PYTHON_VERSION: "3.6"
PYTHON_ARCH: "64"
......
debian/changelog
View file @ 211d64e8
satpy (0.14.1-1) UNRELEASED; urgency=medium
* New upstream release.
* Re-enable dependency form python3-netcdf (#915260 has been fixed now).
* Updated debian/copyright.
* debian/patches:
- refresh all patches
- new 0003-Fix-compat-with-old-xarray-and-dask-versions.patch
* debian/control:
- update pyresample dependency version
-- Antonio Valentino <antonio.valentino@tiscali.it> Mon, 22 Apr 2019 09:18:01 +0200
satpy (0.12.0-1) unstable; urgency=medium
* New upstream release (Closes: #919566).
......
debian/control
View file @ 211d64e8
......@@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 11),
python3-geotiepoints,
python3-glymur,
python3-grib,
python3-h5netcdf,
python3-h5py,
python3-hdf4,
python3-imageio,
......@@ -27,8 +28,8 @@ Build-Depends: debhelper (>= 11),
python3-pyninjotiff,
python3-pyorbital (>= 1.3.1),
python3-pyproj,
python3-pyresample (>= 1.10.3),
python3-pyspectral,
python3-pyresample (>= 1.12.0),
python3-pyspectral (>= 0.8.7),
python3-rasterio,
python3-requests,
python3-scipy,
......@@ -56,7 +57,7 @@ Depends: python3-dask,
python3-pil,
python3-pykdtree,
python3-pyproj,
python3-pyresample (>= 1.10.3),
python3-pyresample (>= 1.12.0),
python3-scipy,
python3-six,
python3-trollimage,
......@@ -71,6 +72,7 @@ Recommends: python3-behave,
python3-gdal,
python3-geotiepoints,
python3-glymur,
python3-h5netcdf,
python3-h5py,
python3-imageio,
python3-libtiff,
......@@ -80,7 +82,7 @@ Recommends: python3-behave,
python3-pygac,
python3-pyninjotiff,
python3-pyorbital (>= 1.3.1),
python3-pyspectral,
python3-pyspectral (>= 0.8.7),
python3-rasterio,
python3-requests,
python3-tables,
......
debian/copyright
View file @ 211d64e8
......@@ -4,12 +4,12 @@ Upstream-Contact: The Pytroll Team <pytroll@googlegroups.com>
Source: https://github.com/pytroll/satpy
Files: *
Copyright: 2009-2018 PyTroll developers
Copyright: 2009-2019 PyTroll developers
2010-2018 PyTroll Community
2011-2018 Pytroll
2011-2019 Pytroll
2014-2018 Adam Dybbroe
2015-2018 SatPy developers
2012-2018 Martin Raspaud
2011-2019 SatPy developers
2012-2019 Martin Raspaud
2018 The Pytroll Crew
2018 Trygve Aspenes
2017 Panu Lahtinen
......
debian/patches/0001-Fix-pyhdf.patch
View file @ 211d64e8
......@@ -3,19 +3,30 @@ Date: Sat, 22 Dec 2018 16:21:14 +0000
Subject: Fix pyhdf
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
setup.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/setup.py b/setup.py
index 0b2aa9c..bf8d4e8 100644
index 9074e98..5599b81 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@ requires = ['numpy >=1.13', 'pillow', 'pyresample >=1.10.3', 'trollsift',
'dask[array] >=0.17.1']
@@ -35,7 +35,7 @@ requires = ['numpy >=1.13', 'pillow', 'pyresample >=1.10.3', 'trollsift',
'trollimage >=1.5.1', 'pykdtree', 'six', 'pyyaml', 'xarray >=0.10.1',
'dask[array] >=0.17.1', 'pyproj']
# pyhdf (conda) == python-hdf4 (pip)
-test_requires = ['behave', 'h5py', 'netCDF4', 'pyhdf', 'imageio', 'libtiff',
+test_requires = ['behave', 'h5py', 'netCDF4', 'python-hdf4', 'imageio', 'libtiff',
'rasterio', 'geoviews']
if sys.version < '3.0':
@@ -44,8 +44,8 @@ if sys.version < '3.0':
extras_require = {
# Readers:
- 'modis_l1b': ['pyhdf', 'python-geotiepoints >= 1.1.7'],
- 'geocat': ['pyhdf'],
+ 'modis_l1b': ['python-hdf4', 'python-geotiepoints >= 1.1.7'],
+ 'geocat': ['python-hdf4'],
'acspo': ['netCDF4 >= 1.1.8'],
'clavrx': ['netCDF4 >= 1.1.8'],
'viirs_l1b': ['netCDF4 >= 1.1.8'],
debian/patches/0002-Disable-extra-dependency-form-geoviews.patch
View file @ 211d64e8
......@@ -8,10 +8,10 @@ Subject: Disable extra dependency form geoviews
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/satpy/tests/test_scene.py b/satpy/tests/test_scene.py
index 58ad1cf..672023f 100644
index 17475aa..a7f95f0 100644
--- a/satpy/tests/test_scene.py
+++ b/satpy/tests/test_scene.py
@@ -1730,6 +1730,13 @@ class TestSceneSaving(unittest.TestCase):
@@ -1945,6 +1945,13 @@ class TestSceneSaving(unittest.TestCase):
os.path.join(self.base_dir, 'test_20180101_000000.tif')))
......@@ -26,19 +26,19 @@ index 58ad1cf..672023f 100644
"""Test Scene conversion to geoviews, xarray, etc."""
diff --git a/setup.py b/setup.py
index bf8d4e8..82aa382 100644
index 5599b81..fda868d 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ requires = ['numpy >=1.13', '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', 'pyproj']
# pyhdf (conda) == python-hdf4 (pip)
test_requires = ['behave', 'h5py', 'netCDF4', 'python-hdf4', 'imageio', 'libtiff',
- 'rasterio', 'geoviews']
+ 'rasterio'] # , 'geoviews']
if sys.version < '3.0':
test_requires.append('mock')
@@ -71,7 +71,7 @@ extras_require = {
@@ -70,7 +70,7 @@ extras_require = {
# Documentation:
'doc': ['sphinx'],
# Other
......
debian/patches/0003-Drop-dependenvy-form-h5netcdf.patch deleted 100644 → 0
View file @ b63db23f
From: Antonio Valentino <antonio.valentino@tiscali.it>
Date: Thu, 21 Feb 2019 09:52:29 +0000
Subject: Drop dependenvy form h5netcdf
---
satpy/tests/writer_tests/__init__.py | 2 +-
setup.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/satpy/tests/writer_tests/__init__.py b/satpy/tests/writer_tests/__init__.py
index 6bb15d0..38cfeca 100644
--- a/satpy/tests/writer_tests/__init__.py
+++ b/satpy/tests/writer_tests/__init__.py
@@ -39,7 +39,7 @@ else:
def suite():
"""Test suite for all writer tests"""
mysuite = unittest.TestSuite()
- mysuite.addTests(test_cf.suite())
+ # mysuite.addTests(test_cf.suite())
mysuite.addTests(test_geotiff.suite())
# mysuite.addTests(test_ninjotiff.suite())
mysuite.addTests(test_simple_image.suite())
diff --git a/setup.py b/setup.py
index 82aa382..76ea4f6 100644
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,7 @@ extras_require = {
'hrit_msg': ['pytroll-schedule'],
'nc_nwcsaf_msg': ['netCDF4 >= 1.1.8'],
'sar_c': ['python-geotiepoints >= 1.1.7', 'gdal'],
- 'abi_l1b': ['h5netcdf'],
+ # 'abi_l1b': ['h5netcdf'],
# Writers:
'scmi': ['netCDF4 >= 1.1.8'],
'geotiff': ['gdal', 'trollimage[geotiff]'],
debian/patches/0003-Fix-compat-with-old-xarray-and-dask-versions.patch 0 → 100644
View file @ 211d64e8
From: Antonio Valentino <antonio.valentino@tiscali.it>
Date: Mon, 22 Apr 2019 16:57:29 +0200
Subject: Fix compat with old xarray and dask versions
---
satpy/tests/test_scene.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/satpy/tests/test_scene.py b/satpy/tests/test_scene.py
index a7f95f0..26160ee 100644
--- a/satpy/tests/test_scene.py
+++ b/satpy/tests/test_scene.py
@@ -35,6 +35,8 @@ try:
except ImportError:
import mock
+from xarray import DataArray
+
# clear the config dir environment variable so it doesn't interfere
os.environ.pop("PPP_CONFIG_DIR", None)
@@ -498,6 +500,7 @@ class TestScene(unittest.TestCase):
self.assertTupleEqual(new_scn1['1'].shape, (3, 184, 714))
self.assertTupleEqual(new_scn1['2'].shape, (92, 3, 357))
+ @unittest.skipIf(not hasattr(DataArray, 'aggregate'), 'DataArray.aggregate not available')
def test_aggregate(self):
"""Test the aggregate method."""
if (sys.version_info < (3, 0)):
@@ -1705,7 +1708,7 @@ class TestSceneResampling(unittest.TestCase):
scene.load(['comp19'])
scene['comp19'].attrs['area'] = area_def
scene['comp19_big'] = xr.DataArray(
- da.zeros((10, 10)), dims=('y', 'x'),
+ da.zeros((10, 10), chunks='auto'), dims=('y', 'x'),
attrs=scene['comp19'].attrs.copy())
scene['comp19_big'].attrs['area'] = area_def_big
scene['comp19_copy'] = scene['comp19'].copy()
debian/patches/series
View file @ 211d64e8
0001-Fix-pyhdf.patch
0002-Disable-extra-dependency-form-geoviews.patch
0003-Drop-dependenvy-form-h5netcdf.patch
0003-Fix-compat-with-old-xarray-and-dask-versions.patch
doc/README
View file @ 211d64e8
......@@ -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.
......