Skip to content

Commit

Permalink
Replace 'libtiff' python dependency with 'pylibtiff' (#1846)
Browse files Browse the repository at this point in the history
* Replace 'libtiff' python dependency with 'pylibtiff'

* Fix invalid projections in builtin areas.yaml

* Remove legacy 'iber' area
  • Loading branch information
djhoese authored Oct 4, 2021
1 parent 8277ea3 commit 4126039
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 17 deletions.
16 changes: 1 addition & 15 deletions satpy/etc/areas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -285,27 +285,13 @@ sve:
description:
Sweden and baltic sea
projection:
init: epsg:3006
EPSG: 3006
shape:
height: 2000
width: 2000
area_extent:
lower_left_xy: [-342379.698, 6032580.06]
upper_right_xy: [1423701.52, 8029648.75]
iber:
description:
North half of the Iberian Peninsula and the Gulf of Biscay
image 0 degrees
projection:
proj: utm
shape:
height: 1000
width: 2000
area_extent:
lower_left_xy: [-342379.698, 4432580.06]
upper_right_xy: [723701.52, 5029648.75]
units: m

brazil2:
description: brazil, platecarree
projection:
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
'dask[array] >=0.17.1', 'pyproj>=2.2', 'zarr', 'donfig', 'appdirs',
'pooch']

test_requires = ['behave', 'h5py', 'netCDF4', 'pyhdf', 'imageio', 'libtiff',
test_requires = ['behave', 'h5py', 'netCDF4', 'pyhdf', 'imageio', 'pylibtiff',
'rasterio', 'geoviews', 'trollimage', 'fsspec', 'bottleneck',
'rioxarray', 'pytest', 'pytest-lazy-fixture']

Expand Down Expand Up @@ -67,7 +67,7 @@
'cf': ['h5netcdf >= 0.7.3'],
'awips_tiled': ['netCDF4 >= 1.1.8'],
'geotiff': ['rasterio', 'trollimage[geotiff]'],
'mitiff': ['libtiff'],
'mitiff': ['pylibtiff'],
'ninjo': ['pyninjotiff', 'pint'],
# Composites/Modifiers:
'rayleigh': ['pyspectral >= 0.10.1'],
Expand Down

0 comments on commit 4126039

Please sign in to comment.