diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 65b5938de..a24eee0f3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,11 +26,11 @@ repos: # Trims trailing whitespace - id: trailing-whitespace - repo: https://github.com/pycqa/flake8 - rev: "6.0.0" + rev: "6.1.0" hooks: - id: flake8 - repo: https://github.com/codespell-project/codespell - rev: "v2.2.5" + rev: "v2.2.6" hooks: - id: codespell types_or: [python, markdown, rst] diff --git a/lib/cartopy/io/__init__.py b/lib/cartopy/io/__init__.py index f5cbd8818..f7416760a 100644 --- a/lib/cartopy/io/__init__.py +++ b/lib/cartopy/io/__init__.py @@ -181,7 +181,7 @@ def path(self, format_dict): :meth:`url` to :meth:`target_path`. Typically, this is the method that most applications will call, - allowing implementors of new Downloaders to specialise + allowing implementers of new Downloaders to specialise :meth:`acquire_resource`. Parameters diff --git a/lib/cartopy/mpl/geoaxes.py b/lib/cartopy/mpl/geoaxes.py index 535aa2924..7d68cf38d 100644 --- a/lib/cartopy/mpl/geoaxes.py +++ b/lib/cartopy/mpl/geoaxes.py @@ -1685,7 +1685,7 @@ def scatter(self, *args, **kwargs): kwargs['transform'].source_projection.is_geodetic()): raise ValueError('Cartopy cannot currently do spherical ' 'scatter. The source CRS cannot be a ' - 'geodetic, consider using the cyllindrical form ' + 'geodetic, consider using the cylindrical form ' '(PlateCarree or RotatedPole).') result = super().scatter(*args, **kwargs) diff --git a/lib/cartopy/tests/mpl/test_patch.py b/lib/cartopy/tests/mpl/test_patch.py index aa537eac8..8d81ddc4e 100644 --- a/lib/cartopy/tests/mpl/test_patch.py +++ b/lib/cartopy/tests/mpl/test_patch.py @@ -56,6 +56,6 @@ def test_nested_polygons(self): # The first square makes the first geometry with the second square as # its interior. The third square is its own geometry with no interior. assert len(geoms) == 2 - assert all(type(geom) == sgeom.Polygon for geom in geoms) + assert all(isinstance(geom, sgeom.Polygon) for geom in geoms) assert len(geoms[0].interiors) == 1 assert len(geoms[1].interiors) == 0 diff --git a/lib/cartopy/tests/test_polygon.py b/lib/cartopy/tests/test_polygon.py index 68a6a7376..81c2ea262 100644 --- a/lib/cartopy/tests/test_polygon.py +++ b/lib/cartopy/tests/test_polygon.py @@ -280,7 +280,7 @@ def test_project_degenerate_poly(self): target = ccrs.PlateCarree() # Before fixing, this would cause a segmentation fault. polygons = target.project_geometry(polygon, source) - assert type(polygons) == sgeom.MultiPolygon + assert isinstance(polygons, sgeom.MultiPolygon) class TestQuality: diff --git a/pyproject.toml b/pyproject.toml index b4cfc58fa..28c440a6f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,8 +76,8 @@ cartopy = ["lib/cartopy/tests/mpl/baseline_images/**", write_to = "lib/cartopy/_version.py" [tool.codespell] -ignore-words-list = "damon,koordinates,linz,slippy,subtiles,tring" -skip = "./.git,./docs/build,./docs/source/gallery,./docs/source/reference,*.cpp,*.css,*.examples,*.js,*.html,*.ipynb,*.pdf,*.rst.txt" +ignore-words-list = "damon,koordinates,linz,manuel,slippy,subtiles,tring" +skip = "docs/source/copyright.rst,*.cpp,*.css,*.examples,*.js,*.html,*.ipynb,*.pdf,*.rst.txt" [tool.check-manifest] ignore = [