Skip to content

Commit

Permalink
Fix various whitespace and line ending issues
Browse files Browse the repository at this point in the history
  • Loading branch information
djhoese committed Dec 13, 2021
1 parent 7f519ee commit 19eecec
Show file tree
Hide file tree
Showing 45 changed files with 53 additions and 85 deletions.
2 changes: 1 addition & 1 deletion .git_archival.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ref-names: $Format:%D$
ref-names: $Format:%D$
1 change: 0 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,3 @@ jobs:
uses: AndreMiras/coveralls-python-action@develop
with:
parallel-finished: true

2 changes: 1 addition & 1 deletion .github/workflows/deploy-sdist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ jobs:
uses: pypa/gh-action-pypi-publish@v1.4.1
with:
user: __token__
password: ${{ secrets.pypi_password }}
password: ${{ secrets.pypi_password }}
2 changes: 1 addition & 1 deletion AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,4 @@ The following people have made contributions to this project:
- [oananicola (oananicola)](https://github.com/oananicola)
- [praerien (praerien)](https://github.com/praerien)
- [Xin Zhang (zxdawn)](https://github.com/zxdawn)
- [Yufei Zhu (yufeizhu600)](https://github.com/yufeizhu600)
- [Yufei Zhu (yufeizhu600)](https://github.com/yufeizhu600)
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ include doc/source/*
include doc/examples/*.py
include LICENSE.txt
include README.rst
include satpy/version.py
include satpy/version.py
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Satpy

.. image:: https://badge.fury.io/py/satpy.svg
:target: https://badge.fury.io/py/satpy

.. image:: https://anaconda.org/conda-forge/satpy/badges/version.svg
:target: https://anaconda.org/conda-forge/satpy/

Expand Down
3 changes: 0 additions & 3 deletions changelog_pre0.9.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4374,6 +4374,3 @@ Other
- Modified image inversion unit test to reflect new behaviour. [Martin
Raspaud]
- New rebase. [Martin Raspaud]



2 changes: 1 addition & 1 deletion doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#

# You can set these variables from the command line.
SPHINXOPTS =
SPHINXOPTS =
SPHINXBUILD = sphinx-build
PAPER =
BUILDDIR = build
Expand Down
2 changes: 1 addition & 1 deletion doc/source/_static/theme_overrides.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
.wy-table-responsive {
overflow: visible !important;
}
}
}
2 changes: 1 addition & 1 deletion doc/source/data_download.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ NOAA GOES on Amazon Web Services
* Associated Readers: ``abi_l1b``

In addition to the pages above, Brian Blaylock's `GOES-2-Go <https://github.com/blaylockbk/goes2go>`_
python package is useful for downloading GOES data to your local machine.
python package is useful for downloading GOES data to your local machine.
Brian also prepared some instructions
for using the ``rclone`` tool for downloading AWS data to a local machine. The
instructions can be found
Expand Down
2 changes: 1 addition & 1 deletion doc/source/dev_guide/custom_reader.rst
Original file line number Diff line number Diff line change
Expand Up @@ -579,4 +579,4 @@ Auxiliary File Download
If your reader needs additional data files to do calibrations, corrections,
or anything else see the :doc:`aux_data` document for more information on
how to download and cache these files without including them in the Satpy
python package.
python package.
1 change: 0 additions & 1 deletion doc/source/dev_guide/xarray_migration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -316,4 +316,3 @@ Helpful functions
- :doc:`delayed`
- :func:`~dask.array.rechunk`
- :attr:`~dask.array.Array.vindex`

2 changes: 1 addition & 1 deletion doc/source/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -138,4 +138,4 @@ GeoTIFF image.
See the
`GDAL GeoTIFF documentation <https://gdal.org/drivers/raster/gtiff.html#creation-options>`_
for more information on the creation options available including other
compression choices.
compression choices.
2 changes: 0 additions & 2 deletions doc/source/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,3 @@ created.
$ virtualenv /path/to/pytroll-env
$ source /path/to/pytroll-env/bin/activate
$ pip install satpy
36 changes: 18 additions & 18 deletions doc/source/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -146,30 +146,30 @@ The 'area' attribute of the DataArray, if present, can be converted to latitude
>>> vis006_lon, vis006_lat = vis006.attrs['area'].get_lonlats()


Visualizing data
================
Visualizing data
================

To visualize loaded data in a pop-up window:

>>> global_scene.show(0.6)

To visualize loaded data in a pop-up window:

>>> global_scene.show(0.6)

Alternatively if working in a Jupyter notebook the scene can be converted to
a `geoviews <https://geoviews.org>`_ object using the
:meth:`~satpy.scene.Scene.to_geoviews` method. The geoviews package is not a
requirement of the base satpy install so in order to use this feature the user
needs to install the geoviews package himself.
>>> import holoviews as hv
>>> import geoviews as gv
>>> import geoviews.feature as gf
>>> gv.extension("bokeh", "matplotlib")
>>> %opts QuadMesh Image [width=600 height=400 colorbar=True] Feature [apply_ranges=False]
>>> %opts Image QuadMesh (cmap='RdBu_r')

>>> import holoviews as hv
>>> import geoviews as gv
>>> import geoviews.feature as gf
>>> gv.extension("bokeh", "matplotlib")
>>> %opts QuadMesh Image [width=600 height=400 colorbar=True] Feature [apply_ranges=False]
>>> %opts Image QuadMesh (cmap='RdBu_r')
>>> gview = global_scene.to_geoviews(vdims=[0.6])
>>> gview[::5,::5] * gf.coastline * gf.borders
Creating new datasets
=====================
>>> gview[::5,::5] * gf.coastline * gf.borders

Creating new datasets
=====================

Calculations based on loaded datasets/channels can easily be assigned to a new dataset:

Expand All @@ -183,7 +183,7 @@ Assigning additional custom metadata is also possible.
>>> from satpy.dataset import combine_metadata
>>> scene['new_band'] = scene[0.8] / scene[0.6]
>>> scene['new_band'].attrs = combine_metadata(scene[0.8], scene[0.6])
>>> scene['new_band'].attrs['some_other_key'] = 'whatever_value_you_want'
>>> scene['new_band'].attrs['some_other_key'] = 'whatever_value_you_want'

Generating composites
=====================
Expand Down
2 changes: 1 addition & 1 deletion doc/source/readers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Available Readers
=================

To get a list of available readers use the `available_readers` function. By default,
it returns the names of available readers. To return additional reader information
it returns the names of available readers. To return additional reader information
use `available_readers(as_dict=True)`::

>>> from satpy import available_readers
Expand Down
2 changes: 1 addition & 1 deletion doc/source/writers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ One common parameter across almost all Writers is ``filename`` and
* - GeoTIFF with NinJo tags
- :class:`ninjogeotiff <satpy.writers.ninjogeotiff.NinJoGeoTIFFWriter>`
- Beta
-
-

Available Writers
=================
Expand Down
2 changes: 1 addition & 1 deletion satpy/etc/composites/msi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ composites:
- name: 'B04'
modifiers: [effective_solar_pathlength_corrected]
standard_name: natural_color

true_color:
compositor: !!python/name:satpy.composites.GenericCompositor
prerequisites:
Expand Down
1 change: 0 additions & 1 deletion satpy/etc/composites/scatterometer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ composites:
prerequisites:
- name: surface_soil_moisture
standard_name: soil_moisture

1 change: 0 additions & 1 deletion satpy/etc/composites/tropomi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ composites:
prerequisites:
- nitrogendioxide_tropospheric_column
standard_name: no2_tropospheric_polluted

2 changes: 0 additions & 2 deletions satpy/etc/enhancements/mimic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,3 @@ enhancements:
],
min_value: 0,
max_value: 8 }


2 changes: 0 additions & 2 deletions satpy/etc/enhancements/scatterometer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,3 @@ enhancements:
kwargs:
palettes:
- {colors: rdbu, min_value: 0, max_value: 100}


12 changes: 6 additions & 6 deletions satpy/etc/eps_avhrrl1b_6.5.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@
File: eps_avhrrl1b_6.5.xml
Copyright (c) 2004, 2005 Eumetsat
This file is part of the EPSXML format specification generated
This file is part of the EPSXML format specification generated
automatically using pfs2xml.
This XML description is distributed under the GPL license; you can
redistribute it and/or modify it under the terms of the GNU General
Public License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This XML description is distributed in the hope that it will be
This XML description is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied warranty
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with the pfs2xml package; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Expand Down
1 change: 0 additions & 1 deletion satpy/etc/readers/acspo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,3 @@ datasets:
name: wind_speed
coordinates: [longitude, latitude]
file_type: acspo_sst

2 changes: 1 addition & 1 deletion satpy/etc/readers/agri_l1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -310,4 +310,4 @@ datasets:
standard_name: satellite_azimuth_angle
resolution: 4000
file_type: agri_l1_4000m_geo
file_key: NOMSatelliteAzimuth
file_key: NOMSatelliteAzimuth
1 change: 0 additions & 1 deletion satpy/etc/readers/ami_l1b.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -338,4 +338,3 @@ datasets:
units: K
file_type: ir133
file_key: image_pixel_values

1 change: 0 additions & 1 deletion satpy/etc/readers/ascat_l2_soilmoisture_bufr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,3 @@ datasets:
coordinates: [longitude, latitude]
key: soilMoistureQuality
fill_value: -1.e+100

2 changes: 1 addition & 1 deletion satpy/etc/readers/avhrr_l1c_eum_gac_fdr_nc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -202,4 +202,4 @@ datasets:
equator_crossing_time:
name: equator_crossing_time
file_type: eumetsat_gac_fdr
nc_key: 'equator_crossing_time'
nc_key: 'equator_crossing_time'
2 changes: 1 addition & 1 deletion satpy/etc/readers/fci_l2_nc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1047,4 +1047,4 @@ datasets:
mask_value: 65535
coordinates:
- longitude
- latitude
- latitude
2 changes: 1 addition & 1 deletion satpy/etc/readers/geocat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -234,4 +234,4 @@ datasets:
# radiance:
# standard_name: toa_outgoing_radiance_per_unit_wavelength
# units: W m-2 um-1 sr-1
file_type: ahi_level1
file_type: ahi_level1
7 changes: 0 additions & 7 deletions satpy/etc/readers/iasi_l2_so2_bufr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,3 @@ datasets:
coordinates: [longitude, latitude]
key: '#1#brightnessTemperatureRealPart'
fill_value: -1.e+100







2 changes: 1 addition & 1 deletion satpy/etc/readers/jami_hrit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,4 @@ datasets:
brightness_temperature:
standard_name: toa_brightness_temperature
units: "K"
file_type: hrit_ir4
file_type: hrit_ir4
1 change: 0 additions & 1 deletion satpy/etc/readers/li_l2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,3 @@ file_types:
li_lfl:
file_reader: !!python/name:satpy.readers.li_l2.LIFileHandler
file_patterns: ['{pflag}_{location_indicator},{data_designator},MTI{spacecraft_id:1d}+{data_source}-{processing_evel}-LFL-{subtype}-{coverage}-{subsetting}-{component1}-{component2}-{component3}-{purpose}-{format}_{oflag}_{originator}_{processing_time:%Y%m%d%H%M%S}_{facility}_{environment}_{start_time:%Y%m%d%H%M%S}_{end_time:%Y%m%d%H%M%S}_{processing_mode}_{special_compression}_{disposition_mode}_{repeat_cycle_in_day}.nc']

9 changes: 4 additions & 5 deletions satpy/etc/readers/maia.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,18 @@ datasets:
coordinates: [Longitude, Latitude ]

CloudMask:
name: CloudMask
name: CloudMask
file_type: maia
coordinates: [Longitude, Latitude ]

# CloudType and CloudMask are bitfields
# description of sub fields
ct:
name: ct
file_type: maia
coordinates: [Longitude, Latitude ]

# Cloud Mask On Pixel
# Cloud Mask On Pixel
cma:
name: cma
file_type: maia
Expand Down Expand Up @@ -109,7 +109,7 @@ datasets:
units: degrees celcius
file_type: maia
coordinates: [Longitude, Latitude ]

Sat_zenith:
name: Sat_zenith
units: degrees
Expand Down Expand Up @@ -177,4 +177,3 @@ datasets:

file_type: maia
coordinates: [Longitude, Latitude ]

2 changes: 1 addition & 1 deletion satpy/etc/readers/mirs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ file_types:
file_patterns:
- 'IMG_SX.{platform_shortname}.D{start_time:%y%j.S%H%M}.E{end_time:%H%M}.B{num}.WE.HR.ORB.nc'

datasets:
datasets:
longitude:
name: longitude
file_type: metop_amsu
Expand Down
6 changes: 3 additions & 3 deletions satpy/etc/readers/modis_l2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,7 @@ datasets:
resolution:
1000:
file_key: Cloud_Water_Path_1621_PCL

cloud_water_path_16:
name: cloud_water_path_16
long_name: "Column Water Path two-band retrieval using band 6 and either band 1, 2, or 5 (specified in Quality_Assurance_1km)from best points: not failed in any way, not marked for clear sky restoral"
Expand All @@ -819,7 +819,7 @@ datasets:
resolution:
1000:
file_key: Cloud_Water_Path_16_PCL

cloud_water_path_37:
name: cloud_water_path_37
long_name: "Column Water Path two-band retrieval using band 20 and either band 1, 2, or 5 (specified in Quality_Assurance_1km)from best points: not failed in any way, not marked for clear sky restoral"
Expand All @@ -839,7 +839,7 @@ datasets:
resolution:
1000:
file_key: Cloud_Water_Path_37_PCL

cloud_effective_radius_uncertainty:
name: cloud_effective_radius_uncertainty
long_name: Cloud Effective Particle Radius (from band 7) Relative Uncertainty (Percent)from both best points and points identified as cloud edge at 1km resolution or partly cloudy at 250m
Expand Down
1 change: 0 additions & 1 deletion satpy/etc/readers/nwcsaf-msg2013-hdf5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -187,4 +187,3 @@ datasets:
resolution: 3000
file_type: h5_nwcsaf_ctth
file_key: CTTH_QUALITY

1 change: 0 additions & 1 deletion satpy/etc/readers/omps_edr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -240,4 +240,3 @@ datasets:
coordinates: [longitude_sampo, latitude_sampo]
file_type: omps_sampo
file_key: SCIENCE_DATA/CloudFraction

1 change: 0 additions & 1 deletion satpy/etc/readers/seadas_l2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,3 @@ datasets:
750:
file_type: chlora_seadas_viirs
coordinates: [longitude, latitude]

2 changes: 0 additions & 2 deletions satpy/etc/readers/seviri_l1b_nc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -218,5 +218,3 @@ datasets:
units: count
file_type: seviri_l1b_nc
nc_key: 'ch6'


1 change: 0 additions & 1 deletion satpy/etc/readers/tropomi_l2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,3 @@ datasets:
file_type: tropomi_l2
file_key: 'PRODUCT/time_utc'
standard_name: time_utc

2 changes: 1 addition & 1 deletion satpy/etc/readers/viirs_edr_active_fires.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,4 @@ datasets:
file_key: "{variable_prefix}FP_T4"
coordinates: [longitude, latitude]
standard_name: toa_brightness_temperature
units: 'K'
units: 'K'
Loading

0 comments on commit 19eecec

Please sign in to comment.