feat(OpenGeode): Update to OpenGeode v12 standards.

MelchiorSchuh · BotellaA · commit 10c9a28e8304 · 2022-09-29T14:29:08.000+02:00
diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
@@ -10,42 +10,30 @@ jobs:
     with:
       name: OPENGEODE_MYMODULE
       repos: OpenGeode
-    secrets:
-      TOKEN: ${{ secrets.TOKEN }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} 
+    secrets: inherit
 
   release-linux-python:
     uses: Geode-solutions/actions/.github/workflows/cd-linux-python.yml@master
     with:
       name: OPENGEODE_MYMODULE
       repos: OpenGeode
-    secrets:
-      TOKEN: ${{ secrets.TOKEN }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} 
-      PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} 
+    secrets: inherit
 
   release-windows:
     uses: Geode-solutions/actions/.github/workflows/cd-windows.yml@master
     with:
       name: OPENGEODE_MYMODULE
       repos: OpenGeode
-    secrets:
-      TOKEN: ${{ secrets.TOKEN }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+    secrets: inherit
 
   release-windows-python:
     uses: Geode-solutions/actions/.github/workflows/cd-windows-python.yml@master
     with:
       name: OPENGEODE_MYMODULE
       repos: OpenGeode
-    secrets:
-      TOKEN: ${{ secrets.TOKEN }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-      PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} 
+    secrets: inherit
 
   notify:
     uses: Geode-solutions/actions/.github/workflows/end-cd.yml@master
     needs: [release-linux, release-linux-python, release-windows, release-windows-python]
-    secrets:
-      TOKEN: ${{ secrets.TOKEN }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+    secrets: inherit
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -2,55 +2,52 @@ name: CI
 
 on: 
   push:
-  pull_request:
   schedule:
     - cron: 0 0 * * *
 
 jobs:
   format:
     uses: Geode-solutions/actions/.github/workflows/format.yml@master
-    secrets:
-      TOKEN: ${{ secrets.TOKEN }}
+    secrets: inherit
       
   build-linux:
     needs: format
     uses: Geode-solutions/actions/.github/workflows/ci-linux.yml@master
     with:
       repos: OpenGeode
-    secrets:
-      TOKEN: ${{ secrets.TOKEN }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+    secrets: inherit
 
   build-linux-python:
     needs: format
     uses: Geode-solutions/actions/.github/workflows/ci-linux-python.yml@master
     with:
       name: OPENGEODE_MYMODULE
       repos: OpenGeode
-    secrets:
-      TOKEN: ${{ secrets.TOKEN }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+    secrets: inherit
 
   coverage:
     needs: format
     uses: Geode-solutions/actions/.github/workflows/coverage.yml@master
     with:
       repos: OpenGeode
-    secrets:
-      TOKEN: ${{ secrets.TOKEN }}  
+    secrets: inherit
   
   build-windows:
     needs: format
     uses: Geode-solutions/actions/.github/workflows/ci-windows.yml@master
     with:
-      name: OPENGEODE_MYMODULE
       repos: OpenGeode
-    secrets:
-      TOKEN: ${{ secrets.TOKEN }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+    secrets: inherit
         
+  build-windows-python:
+    needs: format
+    uses: Geode-solutions/actions/.github/workflows/ci-windows-python.yml@master
+    with:
+      name: OPENGEODE_MYMODULE
+      repos: OpenGeode
+    secrets: inherit
+
   semantic-release:
     needs: [build-linux, build-linux-python, build-windows]
     uses: Geode-solutions/actions/.github/workflows/release.yml@master
-    secrets:
-      TOKEN: ${{ secrets.TOKEN }}
+    secrets: inherit
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,7 +18,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.15)
+
+cmake_policy(SET CMP0091 NEW)
 
 # Define the project
 project(OpenGeode-MyModule CXX)
diff --git a/bindings/python/__init__.py b/bindings/python/__init__.py
@@ -19,4 +19,4 @@
 # SOFTWARE.
 
 
-from .opengeode_mymodule_py_mylib import *
+from .mylib import *
diff --git a/bindings/python/mylib.py b/bindings/python/mylib.py
@@ -0,0 +1,8 @@
+#
+# Copyright (c) 2019 - 2022 Geode-solutions. All rights reserved.
+#
+
+import opengeode
+
+from .opengeode_mymodule_py_mylib import *
+MyModuleMyLib.initialize()
diff --git a/bindings/python/requirements.txt b/bindings/python/requirements.txt
@@ -1 +1 @@
-OpenGeode-core >= 10.0.16, == 10.*
+OpenGeode-core >= 12.1.8, == 12.*
diff --git a/bindings/python/src/mylib/mylib.cpp b/bindings/python/src/mylib/mylib.cpp
@@ -28,5 +28,7 @@
 PYBIND11_MODULE( opengeode_mymodule_py_mylib, module )
 {
     module.doc() = "OpenGeode-ModuleTemplate Python binding for mylib";
+    pybind11::class_< mymodule::MyModuleMyLib >( module, "MyModuleMyLib" )
+        .def( "initialize", &mymodule::MyModuleMyLib::initialize );
     module.def( "hello_world", &mymodule::hello_world );
 }
diff --git a/include/mylib/common.h b/include/mylib/common.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2019 - 2022 Geode-solutions. All rights reserved.
+ */
+
+#pragma once
+
+#include <geode/basic/common.h>
+#include <geode/basic/library.h>
+#include <mylib/opengeode_mymodule_mylib_export.h>
+
+namespace mymodule
+{
+    OPENGEODE_LIBRARY( opengeode_mymodule_mylib_api, MyModuleMyLib );
+} // namespace mymodule
diff --git a/include/mylib/hello_world.h b/include/mylib/hello_world.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <mylib/opengeode_mymodule_mylib_export.h>
+#include <mylib/common.h>
 
 namespace mymodule
 {
diff --git a/src/mylib/common.cpp b/src/mylib/common.cpp
@@ -21,14 +21,17 @@
  *
  */
 
+#include <mylib/common.h>
+
 #include <geode/basic/common.h>
 
-namespace
+namespace mymodule
 {
-    OPENGEODE_LIBRARY_INITIALIZE( myLib )
+    OPENGEODE_LIBRARY_IMPLEMENTATION( MyModuleMyLib )
     {
         /* Here the functions to call when initializing the library
          * For exemple: registers, ...
          */
+        geode::OpenGeodeBasic::initialize();
     }
-} // namespace
+} // namespace mymodule
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.15)
     
 if(NOT TARGET OpenGeode-MyModule::mylib)
     project(OpenGeode-MyModule CXX)
diff --git a/tests/mylib/test-hello-world.cpp b/tests/mylib/test-hello-world.cpp
@@ -30,6 +30,7 @@ int main()
 {
     try
     {
+        mymodule::MyModuleMyLib::initialize();
         OPENGEODE_EXCEPTION(
             mymodule::hello_world(), "[Test] Hello World is not correct" );
 

Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,4 @@`
`19`	`19`	`# SOFTWARE.`
`20`	`20`
`21`	`21`
`22`		`-from .opengeode_mymodule_py_mylib import *`
	`22`	`+from .mylib import *`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OpenGeode-core >= 10.0.16, == 10.*`
	`1`	`+OpenGeode-core >= 12.1.8, == 12.*`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,7 @@`
`28`	`28`	`PYBIND11_MODULE( opengeode_mymodule_py_mylib, module )`
`29`	`29`	`{`
`30`	`30`	`module.doc() = "OpenGeode-ModuleTemplate Python binding for mylib";`
	`31`	`+ pybind11::class_< mymodule::MyModuleMyLib >( module, "MyModuleMyLib" )`
	`32`	`+ .def( "initialize", &mymodule::MyModuleMyLib::initialize );`
`31`	`33`	`module.def( "hello_world", &mymodule::hello_world );`
`32`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`#pragma once`
`25`	`25`
`26`		`-#include <mylib/opengeode_mymodule_mylib_export.h>`
	`26`	`+#include <mylib/common.h>`
`27`	`27`
`28`	`28`	`namespace mymodule`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,17 @@`
`21`	`21`	`*`
`22`	`22`	`*/`
`23`	`23`
	`24`	`+#include <mylib/common.h>`
	`25`	`+`
`24`	`26`	`#include <geode/basic/common.h>`
`25`	`27`
`26`		`-namespace`
	`28`	`+namespace mymodule`
`27`	`29`	`{`
`28`		`- OPENGEODE_LIBRARY_INITIALIZE( myLib )`
	`30`	`+ OPENGEODE_LIBRARY_IMPLEMENTATION( MyModuleMyLib )`
`29`	`31`	`{`
`30`	`32`	`/* Here the functions to call when initializing the library`
`31`	`33`	`* For exemple: registers, ...`
`32`	`34`	`*/`
	`35`	`+ geode::OpenGeodeBasic::initialize();`
`33`	`36`	`}`
`34`		`-} // namespace`
	`37`	`+} // namespace mymodule`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ int main()`
`30`	`30`	`{`
`31`	`31`	`try`
`32`	`32`	`{`
	`33`	`+ mymodule::MyModuleMyLib::initialize();`
`33`	`34`	`OPENGEODE_EXCEPTION(`
`34`	`35`	`mymodule::hello_world(), "[Test] Hello World is not correct" );`
`35`	`36`