Release/v1.2.2 (#142)

* Updating to NJOY2016.61. * Adding new test for NJOY21 version. * Updating lipservice version. * Improving the way that we ignore uninitilized errors in lipservice. * Trying to fix warning suppression. * Updating release notes * Removing commented code. * Removing g++ from GitHub Actions. * Update to Python 3.5 Co-authored-by: Wim Haeck <[email protected]>
njoy · Jan 21, 2021 · 0e2ce9f · 0e2ce9f
1 parent e6fb3c3
commit 0e2ce9f
Show file tree

Hide file tree

Showing 213 changed files with 1,817,135 additions and 1,245,999 deletions.
diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-18.04, macos-10.15 ]
-        cxx: [ g++-8, clang++ ]
+        cxx: [ clang++ ]
         vFortran: [ gfortran-8 ]
         build_type: [ Debug, Release ]
 
@@ -37,6 +37,6 @@ jobs:
       run: make -j2 VERBOSE=1
       working-directory: ./bin
     - name: ctest
-      run: ctest -j2 -R njoy21*
+      run: ctest -j2
       working-directory: ./bin
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,6 +10,8 @@ enable_language( Fortran )
 # Project-wide setup
 ########################################################################
 
+find_package( Python3 3.5 REQUIRED )
+
 set( CMAKE_CXX_STANDARD 17 )
 set( CMAKE_CXX_STANDARD_REQUIRED YES )
 

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,6 +1,12 @@
 # Release Notes&mdash;NJOY21
 Given here are some release notes for NJOY21. Each release is made through a formal [Pull Request](https://github.com/njoy/NJOY21/pulls) made on GitHub. There are links in this document that point to each of those Pull Requests, where you can see in great details the changes that were made. Often the Pull Requests are made in response to an [issue](https://github.com/njoy/NJOY21/issues). In such cases, links to those issues are also given.
 
+## [NJOY21 1.2.2](https://github.com/njoy/NJOY21/pull/142)
+- Updating Legacy NJOY to NJOY2016.61. See [release 2016.61](https://github.com/njoy/NJOY2016/releases/tag/2016.61) for more information
+- Adding additional regression tests.
+
+This release is in preparation for the upcoming 1.3.0 release.
+
 ## [NJOY21 1.2.1](https://github.com/njoy/NJOY21/pull/126)
 This update removes the `--signature` command-line option as that was a feature of the previous build system. This also updates the GitHub Actions such that they now test all of the NJOY21 stuff, but not the integration tests.
 

diff --git a/cmake/develop_dependencies.cmake b/cmake/develop_dependencies.cmake
@@ -23,6 +23,11 @@ FetchContent_Declare( lipservice
     GIT_SHALLOW     TRUE
     )
 
+FetchContent_Declare( njoy
+    GIT_REPOSITORY  http://github.com/njoy/NJOY2016
+    GIT_TAG         2016.61
+    )
+
 FetchContent_Declare( njoy_c_bindings
     GIT_REPOSITORY  https://github.com/njoy/njoy_c_bindings
     GIT_TAG         origin/master

diff --git a/cmake/release_dependencies.cmake b/cmake/release_dependencies.cmake
@@ -37,7 +37,7 @@ FetchContent_Declare( header-utilities
 
 FetchContent_Declare( lipservice
     GIT_REPOSITORY  https://github.com/njoy/lipservice
-    GIT_TAG         a9b4696883f8b363b28b5b31eecb585ca4429c94
+    GIT_TAG         1efa5e9452384a7bfc278fde57979c4d91e312c0
     )
 
 FetchContent_Declare( Log
@@ -47,7 +47,7 @@ FetchContent_Declare( Log
 
 FetchContent_Declare( njoy
     GIT_REPOSITORY  http://github.com/njoy/NJOY2016
-    GIT_TAG         b41e221c0752d5e03ed0a74d4cb6106023a59b99
+    GIT_TAG         e722511e88e4568502b51a15cebd38d03fd060a8 # tag: 2016.61
     )
 
 FetchContent_Declare( njoy_c_bindings
@@ -59,7 +59,6 @@ FetchContent_Declare( nlohmann_json
     GIT_REPOSITORY  https://github.com/nlohmann/json
     GIT_TAG         e7b3b40b5a95bc74b9a7f662830a27c49ffc01b4 # tag: v3.7.3
     )
-set(JSON_BuildTests OFF CACHE INTERNAL "")
 
 FetchContent_Declare( range-v3-adapter
     GIT_REPOSITORY  https://github.com/njoy/range-v3-adapter
@@ -70,7 +69,6 @@ FetchContent_Declare( spdlog
     GIT_REPOSITORY  https://github.com/gabime/spdlog
     GIT_TAG         a51b4856377a71f81b6d74b9af459305c4c644f8
     )
-set( SPDLOG_BUILD_TESTING CACHE BOOL OFF )
 
 FetchContent_Declare( tclap-adapter
     GIT_REPOSITORY  https://github.com/njoy/tclap-adapter

diff --git a/cmake/unit_testing.cmake b/cmake/unit_testing.cmake
@@ -12,5 +12,6 @@ enable_testing()
 
 add_subdirectory( src/njoy21/CommandLine/test )
 add_subdirectory( src/njoy21/Driver/test )
+add_subdirectory( src/njoy21/Version/test )
 add_subdirectory( src/njoy21/io/Manager/test )
 add_subdirectory( src/njoy21/legacy/Sequence/test )
diff --git a/src/njoy21.hpp b/src/njoy21.hpp
@@ -3,8 +3,6 @@
 
 #include <variant>
 #include <map>
-
-
 #include <optional>
 #include <sstream>
 #include <unordered_set>

diff --git a/src/njoy21/Version.hpp b/src/njoy21/Version.hpp
@@ -4,7 +4,7 @@ class Version{
   // Change whenever new capability is implemented
   static constexpr int minorVersion{2};
   // Change whenever merge to master branch is done
-  static constexpr int patchVersion{0};
+  static constexpr int patchVersion{2};
 
   static std::string version(){
     return std::to_string( majorVersion ) + "." +

diff --git a/src/njoy21/Version/test/CMakeLists.txt b/src/njoy21/Version/test/CMakeLists.txt
@@ -0,0 +1,13 @@
+add_executable( njoy21.Version.test Version.test.cpp )
+target_compile_options( njoy21.Version.test PRIVATE ${${PREFIX}_common_flags}
+$<$<BOOL:${strict}>:${${PREFIX}_strict_flags}>$<$<CONFIG:DEBUG>:
+${${PREFIX}_DEBUG_flags}
+$<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags}>>
+$<$<CONFIG:RELEASE>:
+${${PREFIX}_RELEASE_flags}
+$<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
+$<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags}>>
+
+${CXX_appended_flags} ${njoy21_appended_flags} )
+target_link_libraries( njoy21.Version.test PUBLIC njoy21_library catch-adapter ) 
+add_test( NAME njoy21.Version COMMAND njoy21.Version.test )
diff --git a/src/njoy21/Version/test/Version.test.cpp b/src/njoy21/Version/test/Version.test.cpp
@@ -0,0 +1,16 @@
+#define CATCH_CONFIG_MAIN
+
+#include "catch.hpp"
+
+namespace njoy21 {
+#include "njoy21/Version.hpp"
+} // namespace 
+
+// This was created in the hopes of avoiding to forget to change the Version
+// number in releases.
+// This is not a guarantee, but it should help.
+SCENARIO( "Testing NJOY21 version" ){
+
+  CHECK( "1.2.2" == njoy21::Version::version() );
+
+} // SCENARIO
diff --git a/tests/01/CMakeLists.txt b/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}" )