Skip to content

Commit e722511

Browse files
whaeckwhaeck
authored
Merge pull request #185 from njoy/fix/python3.5
Updated Python version to 3.5 minimum
2 parents 06b5f41 + b3f5442 commit e722511

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+132
-144
lines changed

‎.github/workflows/ContinuousIntegration.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
matrix:
1616
os: [ubuntu-18.04, macos-10.15]
1717
build_type: [ Debug, Release ]
18-
python-version: [3.5]
1918
vFortran: [ gfortran-8 ]
2019

2120
steps:
@@ -24,12 +23,6 @@ jobs:
2423
which ${{matrix.vFortran}}
2524
${{matrix.vFortran}} --version
2625
- uses: actions/checkout@v2
27-
- name: Set up Python ${{ matrix.python-version }}
28-
uses: actions/setup-python@v2
29-
with:
30-
python-version: ${{ matrix.python-version }}
31-
- name: Display Python version
32-
run: python -c "import sys; print(sys.version)"
3326
- name: mkdir bin
3427
run: mkdir bin
3528
- name: cmake

‎CMakeLists.txt

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11

2-
cmake_minimum_required( VERSION 3.2 )
2+
cmake_minimum_required( VERSION 3.2 )
3+
4+
find_package( Python3 3.5 REQUIRED )
5+
36
set( CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Supported configuration types" FORCE )
4-
7+
58
project( njoy LANGUAGES Fortran )
69
get_directory_property( is_subproject PARENT_DIRECTORY )
710
include( CMakeDependentOption REQUIRED )
@@ -35,7 +38,7 @@ if ( static AND ( "${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin" ) )
3538
endif()
3639

3740
CMAKE_DEPENDENT_OPTION( static_libraries "Statically link component libraries" OFF "NOT static" ON )
38-
CMAKE_DEPENDENT_OPTION( static_njoy "Statically link the njoy component library" OFF "NOT static;NOT static_libraries" ON )
41+
CMAKE_DEPENDENT_OPTION( static_njoy "Statically link the njoy component library" OFF "NOT static;NOT static_libraries" ON )
3942

4043
if ( profile_generate AND profile_use )
4144
message( FATAL_ERROR "Cannot both generate and use execution profile in the same configuration" )
@@ -46,7 +49,7 @@ if ( profile_generate )
4649
endif()
4750

4851
set( CMAKE_Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/fortran_modules" CACHE PATH "directory for fortran modules" )
49-
file( MAKE_DIRECTORY "${CMAKE_Fortran_MODULE_DIRECTORY}" )
52+
file( MAKE_DIRECTORY "${CMAKE_Fortran_MODULE_DIRECTORY}" )
5053

5154
set( njoy_GNU_Linux_common_flags "-Wall" "-Wextra" )
5255
set( njoy_GNU_Linux_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-frounding-math" "-fsignaling-nans" "-fcheck=all" "-ffpe-trap=invalid,zero,overflow" )
@@ -89,7 +92,7 @@ if ( static_njoy )
8992
set( njoy_library_linkage STATIC )
9093
else ()
9194
set( njoy_library_linkage SHARED )
92-
endif ()
95+
endif ()
9396

9497
set( CMAKE_SKIP_BUILD_RPATH FALSE )
9598
set( CMAKE_BUILD_WITH_INSTALL_RPATH FALSE )
@@ -119,7 +122,7 @@ execute_process(
119122
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
120123
OUTPUT_VARIABLE GIT_HASH
121124
OUTPUT_STRIP_TRAILING_WHITESPACE
122-
)
125+
)
123126

124127
message( STATUS "" )
125128
message( STATUS "-----------------------------------------------------------" )
@@ -130,7 +133,7 @@ message( STATUS "Git commit hash: ${GIT_HASH}" )
130133
message( STATUS "" )
131134
message( STATUS "-----------------------------------------------------------" )
132135

133-
add_library( njoy ${njoy_library_linkage}
136+
add_library( njoy ${njoy_library_linkage}
134137
"${CMAKE_CURRENT_SOURCE_DIR}/src/acecm.f90"
135138
"${CMAKE_CURRENT_SOURCE_DIR}/src/acedo.f90"
136139
"${CMAKE_CURRENT_SOURCE_DIR}/src/acefc.f90"
@@ -175,20 +178,20 @@ target_include_directories( njoy PUBLIC "${CMAKE_Fortran_MODULE_DIRECTORY}" )
175178

176179
set( PREFIX njoy_${CMAKE_Fortran_COMPILER_ID}_${CMAKE_SYSTEM_NAME} )
177180

178-
target_compile_options( njoy PRIVATE
181+
target_compile_options( njoy PRIVATE
179182
${${PREFIX}_common_flags}
180183
$<$<BOOL:${njoy_strict}>:${${PREFIX}_njoy_strict_flags}>
181184
$<$<BOOL:${static}>:${${PREFIX}_static_flags}>
182185
$<$<BOOL:${is_subproject}>:${${PREFIX}_subproject_flags}>
183186
$<$<NOT:$<BOOL:${is_subproject}>>:${${PREFIX}_base_project_flags}>
184187
$<$<CONFIG:DEBUG>:
185-
${${PREFIX}_DEBUG_flags}
188+
${${PREFIX}_DEBUG_flags}
186189
$<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags}>>
187190
$<$<CONFIG:RELEASE>:
188-
${${PREFIX}_RELEASE_flags}
189-
$<$<BOOL:${profile_generate}>:${${PREFIX}_profile_generate_flags}>
190-
$<$<BOOL:${profile_use}>:${${PREFIX}_profile_use_flags}>
191-
$<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
191+
${${PREFIX}_RELEASE_flags}
192+
$<$<BOOL:${profile_generate}>:${${PREFIX}_profile_generate_flags}>
193+
$<$<BOOL:${profile_use}>:${${PREFIX}_profile_use_flags}>
194+
$<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
192195
$<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags}>>
193196
${Fortran_appended_flags} ${njoy_appended_flags} )
194197

@@ -197,27 +200,27 @@ target_link_libraries( njoy PUBLIC "$<$<AND:$<CONFIG:RELEASE>,$<BOOL:${link_time
197200
if ( NOT is_subproject )
198201
add_executable( njoy_executable src/main.f90 )
199202
set_target_properties( njoy_executable PROPERTIES OUTPUT_NAME njoy )
200-
target_compile_options( njoy_executable PRIVATE
203+
target_compile_options( njoy_executable PRIVATE
201204
${${PREFIX}_common_flags}
202205
$<$<BOOL:${njoy_strict}>:${${PREFIX}_njoy_strict_flags}>
203206
$<$<BOOL:${static}>:${${PREFIX}_static_flags}>
204207
$<$<BOOL:${is_subproject}>:${${PREFIX}_subproject_flags}>
205208
$<$<NOT:$<BOOL:${is_subproject}>>:${${PREFIX}_base_project_flags}>
206209
$<$<CONFIG:DEBUG>:
207-
${${PREFIX}_DEBUG_flags}
210+
${${PREFIX}_DEBUG_flags}
208211
$<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags}>>
209212
$<$<CONFIG:RELEASE>:
210-
${${PREFIX}_RELEASE_flags}
211-
$<$<BOOL:${profile_generate}>:${${PREFIX}_profile_generate_flags}>
212-
$<$<BOOL:${profile_use}>:${${PREFIX}_profile_use_flags}>
213-
$<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
213+
${${PREFIX}_RELEASE_flags}
214+
$<$<BOOL:${profile_generate}>:${${PREFIX}_profile_generate_flags}>
215+
$<$<BOOL:${profile_use}>:${${PREFIX}_profile_use_flags}>
216+
$<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
214217
$<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags}>>
215218
${Fortran_appended_flags} ${njoy_appended_flags} )
216219
target_link_libraries( njoy_executable PUBLIC njoy )
217220
endif()
218221

219222
if( NOT is_subproject )
220-
enable_testing()
223+
enable_testing()
221224
add_subdirectory( tests )
222225
endif()
223226

@@ -226,21 +229,21 @@ if ( NOT is_subproject )
226229
list( APPEND installation_targets njoy_executable )
227230
endif()
228231

229-
install( TARGETS ${installation_targets}
232+
install( TARGETS ${installation_targets}
230233
RUNTIME DESTINATION bin
231234
LIBRARY DESTINATION lib
232235
ARCHIVE DESTINATION lib
233-
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
234-
GROUP_EXECUTE GROUP_READ
236+
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
237+
GROUP_EXECUTE GROUP_READ
235238
WORLD_EXECUTE WORLD_READ )
236239

237-
file( RELATIVE_PATH relative_fortran_module_files_path
240+
file( RELATIVE_PATH relative_fortran_module_files_path
238241
"${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_Fortran_MODULE_DIRECTORY}" )
239-
file( GLOB fortran_module_files
242+
file( GLOB fortran_module_files
240243
RELATIVE "${relative_fortran_module_files_path}"
241244
*.mod )
242-
install( FILES ${fortran_module_files}
245+
install( FILES ${fortran_module_files}
243246
DESTINATION include
244-
PERMISSIONS OWNER_READ OWNER_WRITE
245-
GROUP_READ
247+
PERMISSIONS OWNER_READ OWNER_WRITE
248+
GROUP_READ
246249
WORLD_READ )

‎tests/01/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ configure_file("${RESOURCES}/t322"
1111
"${CMAKE_CURRENT_BINARY_DIR}/tape26" COPYONLY )
1212

1313
add_test( NAME "Test01"
14-
COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
14+
COMMAND ${Python3_EXECUTABLE} "../execute.py"
1515
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

‎tests/02/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ configure_file("${RESOURCES}/t404"
1010
"${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
1111

1212
add_test( NAME "Test02"
13-
COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
13+
COMMAND ${Python3_EXECUTABLE} "../execute.py"
1414
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

‎tests/03/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ configure_file("${RESOURCES}/gam27"
1111
"${CMAKE_CURRENT_BINARY_DIR}/tape32" COPYONLY )
1212

1313
add_test( NAME "Test03"
14-
COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
14+
COMMAND ${Python3_EXECUTABLE} "../execute.py"
1515
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

‎tests/04/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape24"
99

1010
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape25"
1111
"${CMAKE_CURRENT_BINARY_DIR}/referenceTape25" COPYONLY )
12-
12+
1313
configure_file("${RESOURCES}/t511"
1414
"${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
1515

1616
add_test( NAME "Test04"
17-
COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
17+
COMMAND ${Python3_EXECUTABLE} "../execute.py"
1818
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

‎tests/05/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape34"
99

1010
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape35"
1111
"${CMAKE_CURRENT_BINARY_DIR}/referenceTape35" COPYONLY )
12-
12+
1313
configure_file("${RESOURCES}/t511"
1414
"${CMAKE_CURRENT_BINARY_DIR}/tape30" COPYONLY )
1515

1616
add_test( NAME "Test05"
17-
COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
17+
COMMAND ${Python3_EXECUTABLE} "../execute.py"
1818
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

‎tests/06/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ configure_file("${RESOURCES}/t511"
88
"${CMAKE_CURRENT_BINARY_DIR}/tape30" COPYONLY )
99

1010
add_test( NAME "Test06"
11-
COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
11+
COMMAND ${Python3_EXECUTABLE} "../execute.py"
1212
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

‎tests/07/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape26"
66

77
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape28"
88
"${CMAKE_CURRENT_BINARY_DIR}/referenceTape28" COPYONLY )
9-
9+
1010
configure_file("${RESOURCES}/t511"
1111
"${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
1212

1313
add_test( NAME "Test07"
14-
COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
14+
COMMAND ${Python3_EXECUTABLE} "../execute.py"
1515
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

‎tests/08/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ configure_file("${RESOURCES}/eni61"
1010
"${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
1111

1212
add_test( NAME "Test08"
13-
COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
13+
COMMAND ${Python3_EXECUTABLE} "../execute.py"
1414
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

0 commit comments

Comments
 (0)