Merge pull request #616 from mraspaud/fix-setuptools-version

Update cibuildwheel to fix setuptools 74.0.0 compatibility

.github/workflows/deploy.yaml

@@ -66,9 +66,9 @@ jobs:
           platforms: all
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.19.2
+        uses: pypa/cibuildwheel@v2.20.0
         env:
-          CIBW_SKIP: "cp36-* cp37-* cp38-* pp* *i686 *-musllinux*"
+          CIBW_SKIP: "cp36-* cp37-* cp38-* cp313-* pp* *i686 *-musllinux*"
           CIBW_ARCHS: "${{ matrix.cibw_archs }}"
           CIBW_TEST_COMMAND: "python -c \"import pyresample; assert 'unknown' not in pyresample.__version__, 'incorrect version found'\""
           CIBW_TEST_SKIP: "*_arm64 *_universal2:arm64"

.pre-commit-config.yaml

@@ -2,14 +2,9 @@ exclude: '^$'
 fail_fast: false
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: 'v0.5.6'
+  rev: 'v0.6.2'
   hooks:
   - id: ruff
-# once https://github.com/astral-sh/ruff/issues/2402 is fully resolved then we can get rid of flake8:
-- repo: https://github.com/pycqa/flake8
-  rev: 7.1.1
-  hooks:
-  - id: flake8
 - repo: https://github.com/pre-commit/pre-commit-hooks
   rev: v4.6.0
   hooks:

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools", "wheel", "numpy>=2.0.0rc1,<2.3", "Cython>=3", "versioneer"]
+requires = ["setuptools", "wheel", "numpy>=2.0.0rc1,<2.3", "Cython>=3", "versioneer[toml]"]
 build-backend = "setuptools.build_meta"
 
 [tool.ruff]
@@ -36,3 +36,22 @@ warn_redundant_casts = true
 warn_unused_ignores = true
 warn_unreachable = true
 warn_unused_configs = true
+
+[tool.versioneer]
+VCS = "git"
+style = "pep440"
+versionfile_source = "pyresample/version.py"
+versionfile_build = "pyresample/version.py"
+tag_prefix = "v"
+
+[tool.isort]
+sections = ["FUTURE", "STDLIB", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"]
+profile = "black"
+skip_gitignore = true
+default_section = "THIRDPARTY"
+known_first_party = "pyresample"
+line_length = 120
+
+[tool.coverage.run]
+relative_files = true
+omit = ["pyresample/version.py", "versioneer.py"]

pyresample/bilinear/__init__.py

@@ -41,11 +41,7 @@
 )
 
 try:
-    from .xarr import (  # noqa: F401
-        CACHE_INDICES,
-        XArrayBilinearResampler,
-        XArrayResamplerBilinear,
-    )
+    from .xarr import CACHE_INDICES, XArrayBilinearResampler, XArrayResamplerBilinear  # noqa: F401
 except ImportError:
     warnings.warn("XArray, dask, and/or zarr not found, XArrayBilinearResampler won't be available.", stacklevel=2)
     XArrayBilinearResampler = None  # type: ignore

pyresample/boundary/__init__.py

@@ -17,9 +17,4 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """The Boundary classes."""
 
-from pyresample.boundary.legacy_boundary import (  # noqa
-    AreaBoundary,
-    AreaDefBoundary,
-    Boundary,
-    SimpleBoundary,
-)
+from pyresample.boundary.legacy_boundary import AreaBoundary, AreaDefBoundary, Boundary, SimpleBoundary  # noqa

pyresample/ewa/dask_ewa.py

@@ -39,10 +39,7 @@
 from dask.highlevelgraph import HighLevelGraph
 
 from pyresample.ewa import ll2cr
-from pyresample.ewa._fornav import (
-    fornav_weights_and_sums_wrapper,
-    write_grid_image_single,
-)
+from pyresample.ewa._fornav import fornav_weights_and_sums_wrapper, write_grid_image_single
 from pyresample.geometry import SwathDefinition
 from pyresample.resampler import BaseResampler
 

pyresample/future/__init__.py

@@ -18,9 +18,4 @@
 """Future features that are backwards incompatible with current functionality."""
 
 from .resamplers import Resampler  # noqa
-from .resamplers import (  # noqa
-    create_resampler,
-    list_resamplers,
-    register_resampler,
-    unregister_resampler,
-)
+from .resamplers import create_resampler, list_resamplers, register_resampler, unregister_resampler  # noqa

pyresample/future/resamplers/__init__.py

@@ -20,10 +20,5 @@
 from __future__ import annotations
 
 from .nearest import KDTreeNearestXarrayResampler  # noqa
-from .registry import (  # noqa
-    create_resampler,
-    list_resamplers,
-    register_resampler,
-    unregister_resampler,
-)
+from .registry import create_resampler, list_resamplers, register_resampler, unregister_resampler  # noqa
 from .resampler import Resampler  # noqa

pyresample/gradient/__init__.py

@@ -36,15 +36,8 @@
 from shapely.geometry import Polygon
 
 from pyresample import CHUNK_SIZE
-from pyresample.geometry import (
-    AreaDefinition,
-    SwathDefinition,
-    get_geostationary_bounding_box_in_lonlats,
-)
-from pyresample.gradient._gradient_search import (
-    one_step_gradient_indices,
-    one_step_gradient_search,
-)
+from pyresample.geometry import AreaDefinition, SwathDefinition, get_geostationary_bounding_box_in_lonlats
+from pyresample.gradient._gradient_search import one_step_gradient_indices, one_step_gradient_search
 from pyresample.resampler import BaseResampler, resample_blocks
 
 logger = logging.getLogger(__name__)

pyresample/resampler.py

@@ -40,12 +40,7 @@
 except ImportError:
     xr = None
 
-from pyresample.geometry import (
-    AreaDefinition,
-    CoordinateDefinition,
-    IncompatibleAreas,
-    SwathDefinition,
-)
+from pyresample.geometry import AreaDefinition, CoordinateDefinition, IncompatibleAreas, SwathDefinition
 
 from .future.resamplers.resampler import hash_dict
 

pyresample/slicer.py

@@ -27,11 +27,7 @@
 from pyproj.enums import TransformDirection
 
 from pyresample import AreaDefinition, SwathDefinition
-from pyresample.geometry import (
-    IncompatibleAreas,
-    InvalidArea,
-    get_geostationary_bounding_box_in_proj_coords,
-)
+from pyresample.geometry import IncompatibleAreas, InvalidArea, get_geostationary_bounding_box_in_proj_coords
 
 try:
     import dask.array as da

pyresample/test/conftest.py

@@ -25,11 +25,7 @@
 
 import pyresample
 from pyresample import LegacyAreaDefinition, LegacySwathDefinition
-from pyresample.future.geometry import (
-    AreaDefinition,
-    CoordinateDefinition,
-    SwathDefinition,
-)
+from pyresample.future.geometry import AreaDefinition, CoordinateDefinition, SwathDefinition
 from pyresample.test.utils import create_test_latitude, create_test_longitude
 
 SRC_SWATH_2D_SHAPE = (50, 10)

pyresample/test/test_bilinear.py

@@ -156,9 +156,7 @@ def test_get_fractional_distances_irregular(self):
 
     def test_get_fractional_distances_uprights_parallel(self):
         """Test calculation when uprights are parallel."""
-        from pyresample.bilinear._base import (
-            _get_fractional_distances_uprights_parallel,
-        )
+        from pyresample.bilinear._base import _get_fractional_distances_uprights_parallel
 
         res = _get_fractional_distances_uprights_parallel(self.pts_vert_parallel, 0., 0.)
         self.assertEqual(res[0], 0.5)
@@ -237,11 +235,7 @@ def test_get_input_xy(self):
 
     def test_get_four_closest_corners(self):
         """Test calculation of bounding corners."""
-        from pyresample.bilinear._base import (
-            _get_four_closest_corners,
-            _get_input_xy,
-            _get_output_xy,
-        )
+        from pyresample.bilinear._base import _get_four_closest_corners, _get_input_xy, _get_output_xy
 
         proj = Proj(self.target_def.proj_str)
         out_x, out_y = _get_output_xy(self.target_def)
@@ -1040,9 +1034,7 @@ def test_get_fractional_distances_irregular(self):
 
     def test_get_fractional_distances_uprights_parallel(self):
         """Test calculation when uprights are parallel."""
-        from pyresample.bilinear._base import (
-            _get_fractional_distances_uprights_parallel,
-        )
+        from pyresample.bilinear._base import _get_fractional_distances_uprights_parallel
 
         res = _get_fractional_distances_uprights_parallel(self.pts_vert_parallel, 0., 0.)
         self.assertEqual(res[0], 0.5)

pyresample/test/test_formatting.py

@@ -22,11 +22,7 @@
 import pytest
 
 import pyresample
-from pyresample._formatting_html import (
-    area_repr,
-    plot_area_def,
-    swath_area_attrs_section,
-)
+from pyresample._formatting_html import area_repr, plot_area_def, swath_area_attrs_section
 
 from .test_geometry.test_swath import _gen_swath_def_numpy, _gen_swath_def_xarray_dask
 

pyresample/test/test_geometry_legacy.py

@@ -31,11 +31,7 @@
 import xarray as xr
 
 from pyresample import geometry
-from pyresample.geometry import (
-    IncompatibleAreas,
-    combine_area_extents_vertical,
-    concatenate_area_defs,
-)
+from pyresample.geometry import IncompatibleAreas, combine_area_extents_vertical, concatenate_area_defs
 from pyresample.test.utils import catch_warnings
 
 

pyresample/test/test_plot.py

@@ -120,10 +120,7 @@ def test_add_gridlines(self, axes, fx_locator):
 
     def test_translate_coast_res(self):
         """Test the translation of coast resolution arguments from old basemap notation to cartopy."""
-        from pyresample.plot import (
-            BASEMAP_NOT_CARTOPY,
-            _translate_coast_resolution_to_cartopy,
-        )
+        from pyresample.plot import BASEMAP_NOT_CARTOPY, _translate_coast_resolution_to_cartopy
 
         with self.assertRaises(KeyError) as raises:
             if sys.version_info > (3,):

pyresample/test/test_resample_blocks.py

@@ -211,10 +211,7 @@ def fun(data, block_info=None, **kwargs):
 
     def test_resample_blocks_can_generate_gradient_indices(self):
         """Test resample blocks can generate gradient indices."""
-        from pyresample.gradient import (
-            gradient_resampler_indices,
-            gradient_resampler_indices_block,
-        )
+        from pyresample.gradient import gradient_resampler_indices, gradient_resampler_indices_block
         from pyresample.resampler import resample_blocks
 
         chunks = 40

pyresample/test/test_resamplers/test_nearest.py

@@ -28,11 +28,7 @@
 
 from pyresample.future.geometry import AreaDefinition, SwathDefinition
 from pyresample.future.resamplers import KDTreeNearestXarrayResampler
-from pyresample.test.utils import (
-    assert_maximum_dask_computes,
-    assert_warnings_contain,
-    catch_warnings,
-)
+from pyresample.test.utils import assert_maximum_dask_computes, assert_warnings_contain, catch_warnings
 from pyresample.utils.errors import PerformanceWarning
 
 

pyresample/test/test_resamplers/test_resampler_registry.py

@@ -25,12 +25,7 @@
 
 import pytest
 
-from pyresample.future import (
-    Resampler,
-    list_resamplers,
-    register_resampler,
-    unregister_resampler,
-)
+from pyresample.future import Resampler, list_resamplers, register_resampler, unregister_resampler
 from pyresample.test.utils import assert_warnings_contain
 
 

pyresample/test/test_utils.py

@@ -29,12 +29,7 @@
 from pyproj import CRS
 
 import pyresample
-from pyresample.test.utils import (
-    TEST_FILES_PATH,
-    assert_future_geometry,
-    create_test_latitude,
-    create_test_longitude,
-)
+from pyresample.test.utils import TEST_FILES_PATH, assert_future_geometry, create_test_latitude, create_test_longitude
 from pyresample.utils import load_cf_area
 from pyresample.utils.row_appendable_array import RowAppendableArray
 
@@ -620,10 +615,7 @@ def test_cf_guess_axis_varname(self):
                           self.nc_handles['nh10km'], 'doesNotExist', 'x', 'polar_stereographic')
 
     def test_cf_is_valid_coordinate_standardname(self):
-        from pyresample.utils.cf import (
-            _is_valid_coordinate_standardname,
-            _valid_cf_type_of_grid_mapping,
-        )
+        from pyresample.utils.cf import _is_valid_coordinate_standardname, _valid_cf_type_of_grid_mapping
 
         # nominal
         for proj_type in _valid_cf_type_of_grid_mapping: