Merge pull request #185 from njoy/fix/python3.5

Updated Python version to 3.5 minimum

.github/workflows/ContinuousIntegration.yml

@@ -15,7 +15,6 @@ jobs:
       matrix:
         os: [ubuntu-18.04, macos-10.15]
         build_type: [ Debug, Release ]
-        python-version: [3.5]
         vFortran: [ gfortran-8 ]
 
     steps:
@@ -24,12 +23,6 @@ jobs:
         which ${{matrix.vFortran}}
         ${{matrix.vFortran}} --version
     - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Display Python version
-      run: python -c "import sys; print(sys.version)"
     - name: mkdir bin
       run: mkdir bin
     - name: cmake

CMakeLists.txt

@@ -1,7 +1,10 @@
 
-cmake_minimum_required( VERSION 3.2 ) 
+cmake_minimum_required( VERSION 3.2 )
+
+find_package( Python3 3.5 REQUIRED )
+
 set( CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Supported configuration types" FORCE )
-        
+
 project( njoy LANGUAGES Fortran )
 get_directory_property( is_subproject PARENT_DIRECTORY )
 include( CMakeDependentOption REQUIRED )
@@ -35,7 +38,7 @@ if ( static AND ( "${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin" ) )
 endif()
 
 CMAKE_DEPENDENT_OPTION( static_libraries "Statically link component libraries" OFF "NOT static" ON )
-CMAKE_DEPENDENT_OPTION( static_njoy "Statically link the njoy component library" OFF "NOT static;NOT static_libraries" ON ) 
+CMAKE_DEPENDENT_OPTION( static_njoy "Statically link the njoy component library" OFF "NOT static;NOT static_libraries" ON )
 
 if ( profile_generate AND profile_use )
     message( FATAL_ERROR "Cannot both generate and use execution profile in the same configuration" )
@@ -46,7 +49,7 @@ if ( profile_generate )
 endif()
 
 set( CMAKE_Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/fortran_modules" CACHE PATH "directory for fortran modules" )
-file( MAKE_DIRECTORY "${CMAKE_Fortran_MODULE_DIRECTORY}" ) 
+file( MAKE_DIRECTORY "${CMAKE_Fortran_MODULE_DIRECTORY}" )
 
 set( njoy_GNU_Linux_common_flags "-Wall" "-Wextra" )
 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 )
     set( njoy_library_linkage STATIC )
 else ()
     set( njoy_library_linkage SHARED )
-endif () 
+endif ()
 
 set( CMAKE_SKIP_BUILD_RPATH FALSE )
 set( CMAKE_BUILD_WITH_INSTALL_RPATH FALSE )
@@ -119,7 +122,7 @@ execute_process(
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
     OUTPUT_VARIABLE GIT_HASH
     OUTPUT_STRIP_TRAILING_WHITESPACE
-) 
+)
 
 message( STATUS "" )
 message( STATUS "-----------------------------------------------------------" )
@@ -130,7 +133,7 @@ message( STATUS "Git commit hash: ${GIT_HASH}" )
 message( STATUS "" )
 message( STATUS "-----------------------------------------------------------" )
 
-add_library( njoy ${njoy_library_linkage} 
+add_library( njoy ${njoy_library_linkage}
              "${CMAKE_CURRENT_SOURCE_DIR}/src/acecm.f90"
              "${CMAKE_CURRENT_SOURCE_DIR}/src/acedo.f90"
              "${CMAKE_CURRENT_SOURCE_DIR}/src/acefc.f90"
@@ -175,20 +178,20 @@ target_include_directories( njoy PUBLIC "${CMAKE_Fortran_MODULE_DIRECTORY}" )
 
 set( PREFIX njoy_${CMAKE_Fortran_COMPILER_ID}_${CMAKE_SYSTEM_NAME} )
 
-target_compile_options( njoy PRIVATE 
+target_compile_options( njoy PRIVATE
 ${${PREFIX}_common_flags}
 $<$<BOOL:${njoy_strict}>:${${PREFIX}_njoy_strict_flags}>
 $<$<BOOL:${static}>:${${PREFIX}_static_flags}>
 $<$<BOOL:${is_subproject}>:${${PREFIX}_subproject_flags}>
 $<$<NOT:$<BOOL:${is_subproject}>>:${${PREFIX}_base_project_flags}>
 $<$<CONFIG:DEBUG>:
-${${PREFIX}_DEBUG_flags} 
+${${PREFIX}_DEBUG_flags}
 $<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags}>>
 $<$<CONFIG:RELEASE>:
-${${PREFIX}_RELEASE_flags} 
-$<$<BOOL:${profile_generate}>:${${PREFIX}_profile_generate_flags}> 
-$<$<BOOL:${profile_use}>:${${PREFIX}_profile_use_flags}> 
-$<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}> 
+${${PREFIX}_RELEASE_flags}
+$<$<BOOL:${profile_generate}>:${${PREFIX}_profile_generate_flags}>
+$<$<BOOL:${profile_use}>:${${PREFIX}_profile_use_flags}>
+$<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
 $<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags}>>
 ${Fortran_appended_flags} ${njoy_appended_flags} )
 
@@ -197,27 +200,27 @@ target_link_libraries( njoy PUBLIC "$<$<AND:$<CONFIG:RELEASE>,$<BOOL:${link_time
 if ( NOT is_subproject )
     add_executable( njoy_executable src/main.f90 )
     set_target_properties( njoy_executable PROPERTIES OUTPUT_NAME njoy )
-    target_compile_options( njoy_executable PRIVATE 
+    target_compile_options( njoy_executable PRIVATE
     ${${PREFIX}_common_flags}
     $<$<BOOL:${njoy_strict}>:${${PREFIX}_njoy_strict_flags}>
     $<$<BOOL:${static}>:${${PREFIX}_static_flags}>
     $<$<BOOL:${is_subproject}>:${${PREFIX}_subproject_flags}>
     $<$<NOT:$<BOOL:${is_subproject}>>:${${PREFIX}_base_project_flags}>
     $<$<CONFIG:DEBUG>:
-    ${${PREFIX}_DEBUG_flags} 
+    ${${PREFIX}_DEBUG_flags}
     $<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags}>>
     $<$<CONFIG:RELEASE>:
-    ${${PREFIX}_RELEASE_flags} 
-    $<$<BOOL:${profile_generate}>:${${PREFIX}_profile_generate_flags}> 
-    $<$<BOOL:${profile_use}>:${${PREFIX}_profile_use_flags}> 
-    $<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}> 
+    ${${PREFIX}_RELEASE_flags}
+    $<$<BOOL:${profile_generate}>:${${PREFIX}_profile_generate_flags}>
+    $<$<BOOL:${profile_use}>:${${PREFIX}_profile_use_flags}>
+    $<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
     $<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags}>>
     ${Fortran_appended_flags} ${njoy_appended_flags} )
     target_link_libraries( njoy_executable PUBLIC njoy )
 endif()
 
 if( NOT is_subproject )
-    enable_testing() 
+    enable_testing()
     add_subdirectory( tests )
 endif()
 
@@ -226,21 +229,21 @@ if ( NOT is_subproject )
     list( APPEND installation_targets njoy_executable )
 endif()
 
-install( TARGETS ${installation_targets} 
+install( TARGETS ${installation_targets}
          RUNTIME DESTINATION bin
          LIBRARY DESTINATION lib
          ARCHIVE DESTINATION lib
-         PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ 
-                     GROUP_EXECUTE GROUP_READ 
+         PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
+                     GROUP_EXECUTE GROUP_READ
                      WORLD_EXECUTE WORLD_READ )
 
-file( RELATIVE_PATH relative_fortran_module_files_path 
+file( RELATIVE_PATH relative_fortran_module_files_path
       "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_Fortran_MODULE_DIRECTORY}" )
-file( GLOB fortran_module_files 
+file( GLOB fortran_module_files
       RELATIVE "${relative_fortran_module_files_path}"
       *.mod )
-install( FILES ${fortran_module_files} 
+install( FILES ${fortran_module_files}
          DESTINATION include
-         PERMISSIONS OWNER_READ OWNER_WRITE 
-                     GROUP_READ 
+         PERMISSIONS OWNER_READ OWNER_WRITE
+                     GROUP_READ
                      WORLD_READ )

tests/01/CMakeLists.txt

@@ -11,5 +11,5 @@ configure_file("${RESOURCES}/t322"
                "${CMAKE_CURRENT_BINARY_DIR}/tape26" COPYONLY )
 
 add_test( NAME "Test01"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/02/CMakeLists.txt

@@ -10,5 +10,5 @@ configure_file("${RESOURCES}/t404"
                "${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
 
 add_test( NAME "Test02"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/03/CMakeLists.txt

@@ -11,5 +11,5 @@ configure_file("${RESOURCES}/gam27"
                "${CMAKE_CURRENT_BINARY_DIR}/tape32" COPYONLY )
 
 add_test( NAME "Test03"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/04/CMakeLists.txt

@@ -9,10 +9,10 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape24"
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape25"
                "${CMAKE_CURRENT_BINARY_DIR}/referenceTape25" COPYONLY )
-	     
+
 configure_file("${RESOURCES}/t511"
                "${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
 
 add_test( NAME "Test04"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/05/CMakeLists.txt

@@ -9,10 +9,10 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape34"
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape35"
                "${CMAKE_CURRENT_BINARY_DIR}/referenceTape35" COPYONLY )
-	     
+
 configure_file("${RESOURCES}/t511"
                "${CMAKE_CURRENT_BINARY_DIR}/tape30" COPYONLY )
 
 add_test( NAME "Test05"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/06/CMakeLists.txt

@@ -8,5 +8,5 @@ configure_file("${RESOURCES}/t511"
                "${CMAKE_CURRENT_BINARY_DIR}/tape30" COPYONLY )
 
 add_test( NAME "Test06"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/07/CMakeLists.txt

@@ -6,10 +6,10 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape26"
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape28"
                "${CMAKE_CURRENT_BINARY_DIR}/referenceTape28" COPYONLY )
-	     
+
 configure_file("${RESOURCES}/t511"
                "${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
 
 add_test( NAME "Test07"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/08/CMakeLists.txt

@@ -10,5 +10,5 @@ configure_file("${RESOURCES}/eni61"
                "${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
 
 add_test( NAME "Test08"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/09/CMakeLists.txt

@@ -8,5 +8,5 @@ configure_file("${RESOURCES}/t511"
                "${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
 
 add_test( NAME "Test09"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/10/CMakeLists.txt

@@ -11,5 +11,5 @@ configure_file("${RESOURCES}/t404"
                "${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
 
 add_test( NAME "Test10"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/11/CMakeLists.txt

@@ -10,5 +10,5 @@ configure_file("${RESOURCES}/t404"
                "${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
 
 add_test( NAME "Test11"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/12/CMakeLists.txt

@@ -6,10 +6,10 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape22"
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape24"
                "${CMAKE_CURRENT_BINARY_DIR}/referenceTape24" COPYONLY )
-	     
+
 configure_file("${RESOURCES}/eni61"
                "${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
 
 add_test( NAME "Test12"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/13/CMakeLists.txt

@@ -6,13 +6,13 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape26"
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape28"
                "${CMAKE_CURRENT_BINARY_DIR}/referenceTape28" COPYONLY )
-	     
+
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape36"
                "${CMAKE_CURRENT_BINARY_DIR}/referenceTape36" COPYONLY )
-	     
+
 configure_file("${RESOURCES}/eni61"
                "${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
 
 add_test( NAME "Test13"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/14/CMakeLists.txt

@@ -6,13 +6,13 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape31"
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape36"
                "${CMAKE_CURRENT_BINARY_DIR}/referenceTape36" COPYONLY )
-	     
+
 configure_file("${RESOURCES}/epn14"
                "${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
 
 configure_file("${RESOURCES}/epn14"
                "${CMAKE_CURRENT_BINARY_DIR}/tape21" COPYONLY )
 
 add_test( NAME "Test14"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/15/CMakeLists.txt

@@ -30,10 +30,10 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape47"
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape91"
                "${CMAKE_CURRENT_BINARY_DIR}/referenceTape91" COPYONLY )
-	     
+
 configure_file("${RESOURCES}/J33U238"
                "${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
 
 add_test( NAME "Test15"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/16/CMakeLists.txt

@@ -18,10 +18,10 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape46"
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape47"
                "${CMAKE_CURRENT_BINARY_DIR}/referenceTape47" COPYONLY )
-	     
+
 configure_file("${RESOURCES}/J33U238"
                "${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
 
 add_test( NAME "Test16"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/17/CMakeLists.txt

@@ -15,7 +15,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape93"
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape99"
                "${CMAKE_CURRENT_BINARY_DIR}/referenceTape99" COPYONLY )
-	     
+
 configure_file("${RESOURCES}/J33U238"
                "${CMAKE_CURRENT_BINARY_DIR}/tape21" COPYONLY )
 
@@ -26,5 +26,5 @@ configure_file("${RESOURCES}/J33Pu239"
                "${CMAKE_CURRENT_BINARY_DIR}/tape23" COPYONLY )
 
 add_test( NAME "Test17"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/18/CMakeLists.txt

@@ -12,10 +12,10 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape39"
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape91"
                "${CMAKE_CURRENT_BINARY_DIR}/referenceTape91" COPYONLY )
-	     
+
 configure_file("${RESOURCES}/DCf252"
                "${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
 
 add_test( NAME "Test18"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/19/CMakeLists.txt

@@ -6,10 +6,10 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape27"
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape29"
                "${CMAKE_CURRENT_BINARY_DIR}/referenceTape29" COPYONLY )
-	     
+
 configure_file("${RESOURCES}/e6pu241c"
                "${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
 
 add_test( NAME "Test19"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/20/CMakeLists.txt

@@ -6,10 +6,10 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape23"
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape27"
                "${CMAKE_CURRENT_BINARY_DIR}/referenceTape27" COPYONLY )
-	     
+
 configure_file("${RESOURCES}/cl35rml"
                "${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
 
 add_test( NAME "Test20"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/21/CMakeLists.txt

@@ -8,5 +8,5 @@ configure_file("${RESOURCES}/n-026_Fe_058-ENDF8.0-Beta4.endf"
                "${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
 
 add_test( NAME "Test21"
-          COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )