Skip to content

Commit 27b53c3

Browse files
author
Benjamin Rösner
committed
Merge branch 'main' into modis_l2_available_datasets
2 parents 81c0df3 + 6fc15fe commit 27b53c3

34 files changed

+2828
-222
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
name: Bug report
33
about: Create a report to help us improve
4+
type: 'bug'
45

56
---
67

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
name: Feature request
33
about: Suggest an idea for this project
4+
type: 'feature'
45

56
---
67

.github/workflows/deploy-sdist.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
2424
- name: Publish package to PyPI
2525
if: github.event.action == 'published'
26-
uses: pypa/gh-action-pypi-publish@v1.12.2
26+
uses: pypa/gh-action-pypi-publish@v1.12.3
2727
with:
2828
user: __token__
2929
password: ${{ secrets.pypi_password }}

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ fail_fast: false
33
repos:
44
- repo: https://github.com/astral-sh/ruff-pre-commit
55
# Ruff version.
6-
rev: 'v0.8.1'
6+
rev: 'v0.8.6'
77
hooks:
88
- id: ruff
99
- repo: https://github.com/pre-commit/pre-commit-hooks
@@ -19,7 +19,7 @@ repos:
1919
- id: bandit
2020
args: [--ini, .bandit]
2121
- repo: https://github.com/pre-commit/mirrors-mypy
22-
rev: 'v1.13.0' # Use the sha / tag you want to point at
22+
rev: 'v1.14.1' # Use the sha / tag you want to point at
2323
hooks:
2424
- id: mypy
2525
additional_dependencies:

AUTHORS.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,5 @@ The following people have made contributions to this project:
106106
- [Clement Laplace (ClementLaplace)](https://github.com/ClementLaplace)
107107
- [Will Sharpe (wjsharpe)](https://github.com/wjsharpe)
108108
- [Sara Hörnquist (shornqui)](https://github.com/shornqui)
109-
- [Antonio Valentino](https://github.com/avalentino)
110109
- [Clément (ludwigvonkoopa)](https://github.com/ludwigVonKoopa)
111110
- [Xuanhan Lai (sgxl)](https://github.com/sgxl)

CHANGELOG.md

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,56 @@
1+
## Version 0.54.0 (2025/01/20)
2+
3+
### Issues Closed
4+
5+
* [Issue 3020](https://github.com/pytroll/satpy/issues/3020) - Re-implement essl_colorized_low_level_moisture using colorize ([PR 3021](https://github.com/pytroll/satpy/pull/3021) by [@gerritholl](https://github.com/gerritholl))
6+
* [Issue 3009](https://github.com/pytroll/satpy/issues/3009) - artefacts in FCI RGBs using 3.8 µm ([PR 3013](https://github.com/pytroll/satpy/pull/3013) by [@gerritholl](https://github.com/gerritholl))
7+
* [Issue 2991](https://github.com/pytroll/satpy/issues/2991) - Resampling MTG FCI high res bands fails when the resample includes bands at different spatial resolutions
8+
* [Issue 2981](https://github.com/pytroll/satpy/issues/2981) - Fix the bug with `satpy` when using `numpy 2.x` which leads to `SEVIRI` resampled files having a double size ([PR 2983](https://github.com/pytroll/satpy/pull/2983) by [@pkhalaj](https://github.com/pkhalaj))
9+
* [Issue 2979](https://github.com/pytroll/satpy/issues/2979) - Improving resolution when setting extent
10+
* [Issue 2977](https://github.com/pytroll/satpy/issues/2977) - CRS data is being printed to title of image
11+
* [Issue 2975](https://github.com/pytroll/satpy/issues/2975) - can't create ABI geo_color composite
12+
* [Issue 2963](https://github.com/pytroll/satpy/issues/2963) - ahi_hrit reader cannot create a Scene
13+
* [Issue 2814](https://github.com/pytroll/satpy/issues/2814) - Reading LI L2 point data is not daskified ([PR 2985](https://github.com/pytroll/satpy/pull/2985) by [@ClementLaplace](https://github.com/ClementLaplace))
14+
* [Issue 2566](https://github.com/pytroll/satpy/issues/2566) - Wrong version numbers at readthedocs
15+
* [Issue 1997](https://github.com/pytroll/satpy/issues/1997) - Resampling from SwathDefinition to AreaDefinition fails with OSError and AssertionError
16+
* [Issue 1788](https://github.com/pytroll/satpy/issues/1788) - integration / regression tests that compare images
17+
* [Issue 1755](https://github.com/pytroll/satpy/issues/1755) - Store project metadata in pyproject.toml
18+
* [Issue 1240](https://github.com/pytroll/satpy/issues/1240) - iber projection lost in the North Pacific
19+
20+
In this release 14 issues were closed.
21+
22+
### Pull Requests Merged
23+
24+
#### Bugs fixed
25+
26+
* [PR 3035](https://github.com/pytroll/satpy/pull/3035) - Pin dask to avoid dataframe problem
27+
* [PR 3030](https://github.com/pytroll/satpy/pull/3030) - Fix sdist tarball including unnecessary files
28+
* [PR 2995](https://github.com/pytroll/satpy/pull/2995) - Add new ABI L2 "CPS" variable name for Cloud Particle Size
29+
* [PR 2985](https://github.com/pytroll/satpy/pull/2985) - li2_nc reader daskified ([2814](https://github.com/pytroll/satpy/issues/2814))
30+
* [PR 2983](https://github.com/pytroll/satpy/pull/2983) - Fix dtype promotion in SEVIRI native reader ([2981](https://github.com/pytroll/satpy/issues/2981))
31+
* [PR 2976](https://github.com/pytroll/satpy/pull/2976) - Fix dtype promotion in `mersi2_l1b` reader
32+
* [PR 2969](https://github.com/pytroll/satpy/pull/2969) - Fix geos proj parameters for Insat 3d satellites
33+
* [PR 2959](https://github.com/pytroll/satpy/pull/2959) - Modified the issue with the calibration coefficient indices for FY-3 satellite data reader
34+
35+
#### Features added
36+
37+
* [PR 3034](https://github.com/pytroll/satpy/pull/3034) - Set issue type in templates
38+
* [PR 3021](https://github.com/pytroll/satpy/pull/3021) - Change ESSL colorisation approach ([3020](https://github.com/pytroll/satpy/issues/3020))
39+
* [PR 3013](https://github.com/pytroll/satpy/pull/3013) - Clip negative FCI radiances ([3009](https://github.com/pytroll/satpy/issues/3009))
40+
* [PR 3007](https://github.com/pytroll/satpy/pull/3007) - Add t865 dataset to olci l2 list ([1767](https://github.com/pytroll/satpy/issues/1767))
41+
* [PR 2999](https://github.com/pytroll/satpy/pull/2999) - Add Accsos image comparison tests
42+
* [PR 2941](https://github.com/pytroll/satpy/pull/2941) - Refactor MVIRI dataset access
43+
* [PR 2565](https://github.com/pytroll/satpy/pull/2565) - Add level-1 readers for the arctic weather satelliter data
44+
45+
#### Clean ups
46+
47+
* [PR 3030](https://github.com/pytroll/satpy/pull/3030) - Fix sdist tarball including unnecessary files
48+
* [PR 3014](https://github.com/pytroll/satpy/pull/3014) - Remove xarray-datatree dependency from CI
49+
* [PR 3010](https://github.com/pytroll/satpy/pull/3010) - Remove version limit on pytest in CI
50+
51+
In this release 18 pull requests were closed.
52+
53+
154
## Version 0.53.0 (2024/11/08)
255

356
### Issues Closed

MANIFEST.in

Lines changed: 0 additions & 17 deletions
This file was deleted.

continuous_integration/environment.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ channels:
33
- conda-forge
44
dependencies:
55
- xarray!=2022.9.0
6-
- dask
6+
- dask<2025.1.0
77
- distributed
88
- dask-image
99
- donfig
@@ -43,7 +43,7 @@ dependencies:
4343
- python-eccodes
4444
# 2.19.1 seems to cause library linking issues
4545
- eccodes>=2.20
46-
- pytest<8.0.0
46+
- pytest
4747
- pytest-cov
4848
- fsspec
4949
- botocore>=1.33
@@ -53,7 +53,6 @@ dependencies:
5353
- pip
5454
- skyfield
5555
- astropy
56-
- xarray-datatree
5756
- pint-xarray
5857
- ephem
5958
- bokeh

doc/source/config.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ If ``clip_negative_radiances=False``, pixels with negative radiances will have
272272

273273
Clipping of negative radiances is currently implemented for the following readers:
274274

275-
* ``abi_l1b``, ``ami_l1b``
275+
* ``abi_l1b``, ``ami_l1b``, ``fci_l1c_nc``
276276

277277

278278
Temporary Directory

pyproject.toml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ authors = [
77
]
88
dependencies = [
99
"platformdirs",
10-
"dask[array]>=0.17.1",
10+
"dask[array]>=0.17.1,<2025.1.0",
1111
"donfig",
1212
"numpy>=1.21",
1313
"packaging",
@@ -62,7 +62,7 @@ seviri_l2_bufr = ["eccodes"]
6262
seviri_l2_grib = ["eccodes"]
6363
hsaf_grib = ["pygrib"]
6464
remote_reading = ["fsspec"]
65-
insat_3d = ["xarray-datatree"]
65+
insat_3d = ["xarray>=2024.10.0"]
6666
gms5-vissr_l1b = ["numba"]
6767
# Writers:
6868
cf = ["h5netcdf >= 0.7.3"]
@@ -87,7 +87,7 @@ satpos_from_tle = ["skyfield", "astropy"]
8787
tests = ["behave", "h5py", "netCDF4", "pyhdf", "imageio",
8888
"rasterio", "geoviews", "trollimage", "fsspec", "bottleneck",
8989
"rioxarray", "pytest", "pytest-lazy-fixtures", "defusedxml",
90-
"s3fs", "eccodes", "h5netcdf", "xarray-datatree",
90+
"s3fs", "eccodes", "h5netcdf", "xarray>=2024.10.0",
9191
"skyfield", "ephem", "pint-xarray", "astropy", "dask-image", "python-geotiepoints", "numba"]
9292
dev = ["satpy[doc,tests]"]
9393

@@ -112,6 +112,16 @@ build-backend = "hatchling.build"
112112
[tool.hatch.metadata]
113113
allow-direct-references = true
114114

115+
[tool.hatch.build.targets.sdist]
116+
only-include = [
117+
"satpy",
118+
"doc",
119+
"AUTHORS.md",
120+
"CHANGELOG.md",
121+
"SECURITY.md",
122+
"CITATION",
123+
]
124+
115125
[tool.hatch.build.targets.wheel]
116126
packages = ["satpy"]
117127

0 commit comments

Comments
 (0)