From 9fee5d7f323f8b46e6f5ef524b484c9effd9a519 Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Fri, 13 Oct 2023 09:11:21 -0500
Subject: [PATCH 1/4] Add Python 3.12 to CI tests

---
 .github/workflows/ci.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
 

From c62ed5a872a09c5d8b100c31c518e0dee2b60550 Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Wed, 25 Oct 2023 09:38:37 -0500
Subject: [PATCH 2/4] Remove PROJ limit in CI environment

This may cause tests to fail when PROJ 9.3.0 is used (bug that is fixed in 9.3.1) but conda-forge is pinned to 9.3.0 so we're not getting new versions of conda-forge packages.
---
 continuous_integration/environment.yaml | 2 --
 1 file changed, 2 deletions(-)

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

From 617e0db2bef9db210191693ff24d7bd00f217c1b Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Thu, 26 Oct 2023 13:56:55 -0500
Subject: [PATCH 3/4] Add skipif for PROJ bug in test_utils.py

---
 pyresample/test/test_utils.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pyresample/test/test_utils.py b/pyresample/test/test_utils.py
index 921bc7371..3f95bb8ab 100644
--- a/pyresample/test/test_utils.py
+++ b/pyresample/test/test_utils.py
@@ -25,6 +25,7 @@
 
 import numpy as np
 import pytest
+import pyproj
 from pyproj import CRS
 
 import pyresample
@@ -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
 

From 9b23d84ebf6319f1b83a5b8dc75d1ae845bcd668 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 26 Oct 2023 18:59:16 +0000
Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 pyresample/test/test_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyresample/test/test_utils.py b/pyresample/test/test_utils.py
index 3f95bb8ab..34b4948f8 100644
--- a/pyresample/test/test_utils.py
+++ b/pyresample/test/test_utils.py
@@ -24,8 +24,8 @@
 from unittest import mock
 
 import numpy as np
-import pytest
 import pyproj
+import pytest
 from pyproj import CRS
 
 import pyresample