Skip to content

Commit 6a8afc0

Browse files
authored
Merge pull request #549 from djhoese/ci-py312
Add Python 3.12 to CI tests
2 parents 9e2acad + 9b23d84 commit 6a8afc0

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
fail-fast: true
1616
matrix:
1717
os: ["windows-latest", "ubuntu-latest", "macos-latest"]
18-
python-version: ["3.9", "3.10", "3.11"]
18+
python-version: ["3.9", "3.11", "3.12"]
1919
experimental: [false]
2020
include:
21-
- python-version: "3.11"
21+
- python-version: "3.12"
2222
os: "ubuntu-latest"
2323
experimental: true
2424

continuous_integration/environment.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ dependencies:
1212
- pillow
1313
- platformdirs
1414
- pyyaml
15-
# 9.3.1 includes bug fix
16-
- proj !=9.3.0
1715
- pyproj
1816
- pykdtree
1917
- rasterio

pyresample/test/test_utils.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
from unittest import mock
2525

2626
import numpy as np
27+
import pyproj
2728
import pytest
2829
from pyproj import CRS
2930

@@ -232,6 +233,7 @@ def test_proj4_str_dict_conversion_with_valueless_parameter(self):
232233
proj_dict2 = utils.proj4.proj4_str_to_dict(proj_str2)
233234
self.assertDictEqual(proj_dict, proj_dict2)
234235

236+
@pytest.mark.skipif(pyproj.__proj_version__ == "9.3.0", reason="Bug in PROJ causes inequality in EPSG comparison")
235237
def test_def2yaml_converter(self):
236238
import tempfile
237239

0 commit comments

Comments
 (0)