From 00ecb21c43893ec160c99b10dc015ce12ce9b4d8 Mon Sep 17 00:00:00 2001 From: Francois Bonneau Date: Wed, 12 Jun 2024 12:00:03 +0200 Subject: [PATCH 1/2] fix(Updates): typos and bugs fix. --- .github/workflows/test.yml | 2 +- CMakeLists.txt | 7 ++++--- COPYLEFT | 2 +- LICENSE | 2 +- README.md | 2 +- bindings/python/mylib.py | 2 +- bindings/python/src/CMakeLists.txt | 2 +- bindings/python/src/mylib/CMakeLists.txt | 2 +- bindings/python/src/mylib/mylib.cpp | 2 +- cmake/Doxyfile.in | 2 +- cmake/OpenGeode-MyModuleConfig.cmake.in | 2 +- include/mylib/common.h | 2 +- include/mylib/hello_world.h | 2 +- src/mylib/common.cpp | 4 ++-- src/mylib/hello_world.cpp | 2 +- tests/CMakeLists.txt | 2 +- tests/mylib/CMakeLists.txt | 2 +- tests/mylib/test-hello-world.cpp | 2 +- 18 files changed, 22 insertions(+), 21 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2047806..f270c0d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,6 +10,6 @@ jobs: test: uses: Geode-solutions/actions/.github/workflows/cpp-test.yml@master with: - name: OPENGEODE + name: OPENGEODE_MYMODULE repos: ${{ vars.REPOS }} secrets: inherit diff --git a/CMakeLists.txt b/CMakeLists.txt index dd68d08..7bdf220 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2019 - 2022 Geode-solutions +# Copyright (c) 2019 - 2024 Geode-solutions # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -40,6 +40,7 @@ add_geode_library( "common.cpp" "hello_world.cpp" PUBLIC_HEADERS + "common.h" "hello_world.h" PRIVATE_DEPENDENCIES OpenGeode::basic @@ -50,12 +51,12 @@ add_geode_library( if(OPENGEODE_MYMODULE_WITH_TESTS) # Enable testing with CTest enable_testing() - message(STATUS "Configuring OpenGeode-MyModule with tests") + message(STATUS "Configuring with tests") add_subdirectory(tests) endif() if(OPENGEODE_MYMODULE_WITH_PYTHON) - message(STATUS "Configuring OpenGeode-MyModule with Python bindings") + message(STATUS "Configuring with Python bindings") add_subdirectory(bindings/python) endif() diff --git a/COPYLEFT b/COPYLEFT index c6cdb92..a9c77e0 100644 --- a/COPYLEFT +++ b/COPYLEFT @@ -1,4 +1,4 @@ ## Dependencies OpenGeode: MIT -Copyright (c) 2019 - 2022 Geode-solutions +Copyright (c) 2019 - 2024 Geode-solutions diff --git a/LICENSE b/LICENSE index 84738bf..1b84de9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 - 2022 Geode-solutions +Copyright (c) 2019 - 2024 Geode-solutions Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index f88dcf9..3964c93 100644 --- a/README.md +++ b/README.md @@ -49,4 +49,4 @@ For questions and support please use the official [slack](https://slackin-openge [MIT](https://opensource.org/licenses/MIT) -Copyright (c) 2019 - 2022, Geode-solutions +Copyright (c) 2019 - 2024, Geode-solutions diff --git a/bindings/python/mylib.py b/bindings/python/mylib.py index 119e809..fa0f272 100644 --- a/bindings/python/mylib.py +++ b/bindings/python/mylib.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2019 - 2022 Geode-solutions. All rights reserved. +# Copyright (c) 2019 - 2024 Geode-solutions. All rights reserved. # import opengeode diff --git a/bindings/python/src/CMakeLists.txt b/bindings/python/src/CMakeLists.txt index 99dac2f..405206a 100644 --- a/bindings/python/src/CMakeLists.txt +++ b/bindings/python/src/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2019 - 2022 Geode-solutions +# Copyright (c) 2019 - 2024 Geode-solutions # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/bindings/python/src/mylib/CMakeLists.txt b/bindings/python/src/mylib/CMakeLists.txt index ff57466..6f8069c 100644 --- a/bindings/python/src/mylib/CMakeLists.txt +++ b/bindings/python/src/mylib/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2019 - 2022 Geode-solutions +# Copyright (c) 2019 - 2024 Geode-solutions # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/bindings/python/src/mylib/mylib.cpp b/bindings/python/src/mylib/mylib.cpp index 9d23798..5fc2e88 100644 --- a/bindings/python/src/mylib/mylib.cpp +++ b/bindings/python/src/mylib/mylib.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 - 2022 Geode-solutions + * Copyright (c) 2019 - 2024 Geode-solutions * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/cmake/Doxyfile.in b/cmake/Doxyfile.in index 41cb250..4a60b82 100644 --- a/cmake/Doxyfile.in +++ b/cmake/Doxyfile.in @@ -1,4 +1,4 @@ -# Copyright (c) 2019 - 2022 Geode-solutions +# Copyright (c) 2019 - 2024 Geode-solutions # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/cmake/OpenGeode-MyModuleConfig.cmake.in b/cmake/OpenGeode-MyModuleConfig.cmake.in index d4c6583..a49f6b8 100644 --- a/cmake/OpenGeode-MyModuleConfig.cmake.in +++ b/cmake/OpenGeode-MyModuleConfig.cmake.in @@ -1,4 +1,4 @@ -# Copyright (c) 2019 - 2022 Geode-solutions +# Copyright (c) 2019 - 2024 Geode-solutions # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/include/mylib/common.h b/include/mylib/common.h index fb5635f..12d2b3d 100644 --- a/include/mylib/common.h +++ b/include/mylib/common.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 - 2022 Geode-solutions. All rights reserved. + * Copyright (c) 2019 - 2024 Geode-solutions. All rights reserved. */ #pragma once diff --git a/include/mylib/hello_world.h b/include/mylib/hello_world.h index 662589c..83e6b1d 100644 --- a/include/mylib/hello_world.h +++ b/include/mylib/hello_world.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 - 2022 Geode-solutions + * Copyright (c) 2019 - 2024 Geode-solutions * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/mylib/common.cpp b/src/mylib/common.cpp index 218c889..4bd225e 100644 --- a/src/mylib/common.cpp +++ b/src/mylib/common.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 - 2022 Geode-solutions + * Copyright (c) 2019 - 2024 Geode-solutions * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ #include -#include +#include namespace mymodule { diff --git a/src/mylib/hello_world.cpp b/src/mylib/hello_world.cpp index 9beffb3..0fca118 100644 --- a/src/mylib/hello_world.cpp +++ b/src/mylib/hello_world.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 - 2022 Geode-solutions + * Copyright (c) 2019 - 2024 Geode-solutions * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 6975c24..9528cc7 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2019 - 2022 Geode-solutions +# Copyright (c) 2019 - 2024 Geode-solutions # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/tests/mylib/CMakeLists.txt b/tests/mylib/CMakeLists.txt index 762ef1e..6f7771f 100755 --- a/tests/mylib/CMakeLists.txt +++ b/tests/mylib/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2019 - 2022 Geode-solutions +# Copyright (c) 2019 - 2024 Geode-solutions # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/tests/mylib/test-hello-world.cpp b/tests/mylib/test-hello-world.cpp index cfa4ebc..1f65b25 100644 --- a/tests/mylib/test-hello-world.cpp +++ b/tests/mylib/test-hello-world.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 - 2022 Geode-solutions + * Copyright (c) 2019 - 2024 Geode-solutions * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal From 0200fcffc301f2f49ed732b61e39180c8861aba5 Mon Sep 17 00:00:00 2001 From: francoisbonneau Date: Wed, 12 Jun 2024 10:01:22 +0000 Subject: [PATCH 2/2] Apply prepare changes --- bindings/python/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/python/requirements.txt b/bindings/python/requirements.txt index 21d0b6f..84af2d5 100644 --- a/bindings/python/requirements.txt +++ b/bindings/python/requirements.txt @@ -4,5 +4,5 @@ # # pip-compile --pre bindings/python/requirements.in # -opengeode-core==14.*,>=14.18.3 +opengeode-core==14.*,>=14.23.1 # via -r bindings/python/requirements.in