Skip to content

Commit e30413e

Browse files
authored
Merge pull request #151 from GEOS-ESM/feature/convert-to-f2py3
Updates to remove Python2 support
2 parents 5b64299 + 35519c7 commit e30413e

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Changed
1313

14+
- Moved from `f2py2` to `f2py3` to enable removal of Python 2 support
15+
1416
### Fixed
1517

1618
### Removed

pre/NSIDC-OSTIA_SST-ICE_blend/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ ecbuild_add_executable (
5252
set_target_properties(reynolds_QUART.x PROPERTIES Fortran_MODULE_DIRECTORY ${include_${this}})
5353

5454
if (USE_F2PY)
55-
find_package(F2PY2)
56-
if (F2PY2_FOUND)
57-
esma_add_f2py2_module(read_ops_bcs
55+
find_package(F2PY3)
56+
if (F2PY3_FOUND)
57+
esma_add_f2py3_module(read_ops_bcs
5858
SOURCES read_bin.f90
5959
DESTINATION bin
6060
INCLUDEDIRS ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR}/lib ${include_${this}}

pre/prepare_ocnExtData/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ ecbuild_add_executable (
3939
set_target_properties(gen_forecast_bcs.x PROPERTIES Fortran_MODULE_DIRECTORY ${include_${this}})
4040

4141
if (USE_F2PY)
42-
find_package(F2PY2)
43-
if (F2PY2_FOUND)
44-
esma_add_f2py2_module(read_sst_ice_bcs
42+
find_package(F2PY3)
43+
if (F2PY3_FOUND)
44+
esma_add_f2py3_module(read_sst_ice_bcs
4545
SOURCES read_sst_ice_bin.f90
4646
DESTINATION bin
4747
INCLUDEDIRS ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR}/lib ${include_${this}}

0 commit comments

Comments
 (0)