diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b2358c583..4af922ccc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,10 +15,10 @@ jobs: fail-fast: true matrix: os: ["windows-latest", "ubuntu-latest", "macos-latest"] - python-version: ["3.9", "3.10", "3.11"] + python-version: ["3.9", "3.11", "3.12"] experimental: [false] include: - - python-version: "3.11" + - python-version: "3.12" os: "ubuntu-latest" experimental: true diff --git a/continuous_integration/environment.yaml b/continuous_integration/environment.yaml index 6dd6f1d0f..df1f9d01a 100644 --- a/continuous_integration/environment.yaml +++ b/continuous_integration/environment.yaml @@ -12,8 +12,6 @@ dependencies: - pillow - platformdirs - pyyaml - # 9.3.1 includes bug fix - - proj !=9.3.0 - pyproj - pykdtree - rasterio diff --git a/pyresample/test/test_utils.py b/pyresample/test/test_utils.py index 921bc7371..34b4948f8 100644 --- a/pyresample/test/test_utils.py +++ b/pyresample/test/test_utils.py @@ -24,6 +24,7 @@ from unittest import mock import numpy as np +import pyproj import pytest from pyproj import CRS @@ -232,6 +233,7 @@ def test_proj4_str_dict_conversion_with_valueless_parameter(self): proj_dict2 = utils.proj4.proj4_str_to_dict(proj_str2) self.assertDictEqual(proj_dict, proj_dict2) + @pytest.mark.skipif(pyproj.__proj_version__ == "9.3.0", reason="Bug in PROJ causes inequality in EPSG comparison") def test_def2yaml_converter(self): import tempfile