From f7f54f8fcb7bf03c1408a74556112e986d0cb0bf Mon Sep 17 00:00:00 2001 From: MelchiorSchuh Date: Mon, 6 Jan 2025 17:02:25 +0100 Subject: [PATCH 1/4] fix(year): Happy new year ! --- CMakeLists.txt | 2 +- COPYLEFT | 2 +- LICENSE | 2 +- README.md | 2 +- bindings/python/CMakeLists.txt | 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 +- bindings/python/tests/CMakeLists.txt | 2 +- bindings/python/tests/mylib/CMakeLists.txt | 2 +- bindings/python/tests/mylib/test-py-hello-world.py | 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 | 2 +- src/mylib/hello_world.cpp | 2 +- tests/CMakeLists.txt | 2 +- tests/mylib/CMakeLists.txt | 2 +- tests/mylib/test-hello-world.cpp | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bdf220..10877e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2019 - 2024 Geode-solutions +# Copyright (c) 2019 - 2025 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/COPYLEFT b/COPYLEFT index a9c77e0..95d6dc9 100644 --- a/COPYLEFT +++ b/COPYLEFT @@ -1,4 +1,4 @@ ## Dependencies OpenGeode: MIT -Copyright (c) 2019 - 2024 Geode-solutions +Copyright (c) 2019 - 2025 Geode-solutions diff --git a/LICENSE b/LICENSE index 1b84de9..b81af04 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 - 2024 Geode-solutions +Copyright (c) 2019 - 2025 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 3964c93..244fdeb 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 - 2024, Geode-solutions +Copyright (c) 2019 - 2025, Geode-solutions diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt index cc0c554..cd474d6 100644 --- a/bindings/python/CMakeLists.txt +++ b/bindings/python/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2019 - 2022 Geode-solutions +# Copyright (c) 2019 - 2025 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/mylib.py b/bindings/python/mylib.py index fa0f272..271c6f5 100644 --- a/bindings/python/mylib.py +++ b/bindings/python/mylib.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2019 - 2024 Geode-solutions. All rights reserved. +# Copyright (c) 2019 - 2025 Geode-solutions. All rights reserved. # import opengeode diff --git a/bindings/python/src/CMakeLists.txt b/bindings/python/src/CMakeLists.txt index 405206a..897d94f 100644 --- a/bindings/python/src/CMakeLists.txt +++ b/bindings/python/src/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2019 - 2024 Geode-solutions +# Copyright (c) 2019 - 2025 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 6f8069c..a2c1602 100644 --- a/bindings/python/src/mylib/CMakeLists.txt +++ b/bindings/python/src/mylib/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2019 - 2024 Geode-solutions +# Copyright (c) 2019 - 2025 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 5fc2e88..6a863e4 100644 --- a/bindings/python/src/mylib/mylib.cpp +++ b/bindings/python/src/mylib/mylib.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 - 2024 Geode-solutions + * Copyright (c) 2019 - 2025 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/tests/CMakeLists.txt b/bindings/python/tests/CMakeLists.txt index 99dac2f..897d94f 100755 --- a/bindings/python/tests/CMakeLists.txt +++ b/bindings/python/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2019 - 2022 Geode-solutions +# Copyright (c) 2019 - 2025 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/tests/mylib/CMakeLists.txt b/bindings/python/tests/mylib/CMakeLists.txt index fc46637..629834f 100755 --- a/bindings/python/tests/mylib/CMakeLists.txt +++ b/bindings/python/tests/mylib/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2019 - 2022 Geode-solutions +# Copyright (c) 2019 - 2025 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/tests/mylib/test-py-hello-world.py b/bindings/python/tests/mylib/test-py-hello-world.py index 278db35..e291bbc 100644 --- a/bindings/python/tests/mylib/test-py-hello-world.py +++ b/bindings/python/tests/mylib/test-py-hello-world.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2022 Geode-solutions +# Copyright (c) 2019 - 2025 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 4a60b82..abadf3a 100644 --- a/cmake/Doxyfile.in +++ b/cmake/Doxyfile.in @@ -1,4 +1,4 @@ -# Copyright (c) 2019 - 2024 Geode-solutions +# Copyright (c) 2019 - 2025 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 a49f6b8..411c862 100644 --- a/cmake/OpenGeode-MyModuleConfig.cmake.in +++ b/cmake/OpenGeode-MyModuleConfig.cmake.in @@ -1,4 +1,4 @@ -# Copyright (c) 2019 - 2024 Geode-solutions +# Copyright (c) 2019 - 2025 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 12d2b3d..08b022d 100644 --- a/include/mylib/common.h +++ b/include/mylib/common.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 - 2024 Geode-solutions. All rights reserved. + * Copyright (c) 2019 - 2025 Geode-solutions. All rights reserved. */ #pragma once diff --git a/include/mylib/hello_world.h b/include/mylib/hello_world.h index 83e6b1d..b5b90a8 100644 --- a/include/mylib/hello_world.h +++ b/include/mylib/hello_world.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 - 2024 Geode-solutions + * Copyright (c) 2019 - 2025 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 4bd225e..e3c91fb 100644 --- a/src/mylib/common.cpp +++ b/src/mylib/common.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 - 2024 Geode-solutions + * Copyright (c) 2019 - 2025 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/hello_world.cpp b/src/mylib/hello_world.cpp index 0fca118..0dc3914 100644 --- a/src/mylib/hello_world.cpp +++ b/src/mylib/hello_world.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 - 2024 Geode-solutions + * Copyright (c) 2019 - 2025 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 9528cc7..c69bbeb 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2019 - 2024 Geode-solutions +# Copyright (c) 2019 - 2025 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 6f7771f..9b836c5 100755 --- a/tests/mylib/CMakeLists.txt +++ b/tests/mylib/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2019 - 2024 Geode-solutions +# Copyright (c) 2019 - 2025 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 1f65b25..e935c54 100644 --- a/tests/mylib/test-hello-world.cpp +++ b/tests/mylib/test-hello-world.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 - 2024 Geode-solutions + * Copyright (c) 2019 - 2025 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 c34a1818d856232ab5f5a341d4aec4a5df7f2145 Mon Sep 17 00:00:00 2001 From: MelchiorSchuh Date: Mon, 6 Jan 2025 16:04:47 +0000 Subject: [PATCH 2/4] Apply prepare changes --- .gitattributes | 2 +- bindings/python/requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitattributes b/.gitattributes index 3ff2dd9..52d3dd6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -tests/* linguist-vendored +tests/** linguist-vendored diff --git a/bindings/python/requirements.txt b/bindings/python/requirements.txt index 84af2d5..555b84d 100644 --- a/bindings/python/requirements.txt +++ b/bindings/python/requirements.txt @@ -1,8 +1,8 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # pip-compile --pre bindings/python/requirements.in # -opengeode-core==14.*,>=14.23.1 +opengeode-core==15.*,>=15.9.3 # via -r bindings/python/requirements.in From a1d6744e2a01780def9ff1a8657ae3fe49a2f6e4 Mon Sep 17 00:00:00 2001 From: MelchiorSchuh Date: Tue, 7 Jan 2025 10:09:02 +0100 Subject: [PATCH 3/4] fix(headers): Updated .h files to .hpp --- CMakeLists.txt | 4 ++-- include/mylib/{common.h => common.hpp} | 6 +++--- include/mylib/{hello_world.h => hello_world.hpp} | 2 +- src/mylib/common.cpp | 4 ++-- src/mylib/hello_world.cpp | 4 ++-- tests/mylib/test-hello-world.cpp | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) rename include/mylib/{common.h => common.hpp} (62%) rename include/mylib/{hello_world.h => hello_world.hpp} (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 10877e0..7617793 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,8 +40,8 @@ add_geode_library( "common.cpp" "hello_world.cpp" PUBLIC_HEADERS - "common.h" - "hello_world.h" + "common.hpp" + "hello_world.hpp" PRIVATE_DEPENDENCIES OpenGeode::basic ) diff --git a/include/mylib/common.h b/include/mylib/common.hpp similarity index 62% rename from include/mylib/common.h rename to include/mylib/common.hpp index 08b022d..ba007d1 100644 --- a/include/mylib/common.h +++ b/include/mylib/common.hpp @@ -4,9 +4,9 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace mymodule { diff --git a/include/mylib/hello_world.h b/include/mylib/hello_world.hpp similarity index 97% rename from include/mylib/hello_world.h rename to include/mylib/hello_world.hpp index b5b90a8..902a5d1 100644 --- a/include/mylib/hello_world.h +++ b/include/mylib/hello_world.hpp @@ -23,7 +23,7 @@ #pragma once -#include +#include namespace mymodule { diff --git a/src/mylib/common.cpp b/src/mylib/common.cpp index e3c91fb..cc67828 100644 --- a/src/mylib/common.cpp +++ b/src/mylib/common.cpp @@ -21,9 +21,9 @@ * */ -#include +#include -#include +#include namespace mymodule { diff --git a/src/mylib/hello_world.cpp b/src/mylib/hello_world.cpp index 0dc3914..3e40a01 100644 --- a/src/mylib/hello_world.cpp +++ b/src/mylib/hello_world.cpp @@ -21,9 +21,9 @@ * */ -#include +#include -#include +#include namespace mymodule { diff --git a/tests/mylib/test-hello-world.cpp b/tests/mylib/test-hello-world.cpp index e935c54..5e3b50c 100644 --- a/tests/mylib/test-hello-world.cpp +++ b/tests/mylib/test-hello-world.cpp @@ -21,10 +21,10 @@ * */ -#include -#include +#include +#include -#include +#include int main() { From 742b684160b8c245e09cbba438b6194fd5ed7fd8 Mon Sep 17 00:00:00 2001 From: MelchiorSchuh Date: Tue, 7 Jan 2025 10:17:42 +0100 Subject: [PATCH 4/4] python --- bindings/python/src/mylib/mylib.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/python/src/mylib/mylib.cpp b/bindings/python/src/mylib/mylib.cpp index 6a863e4..8614f3f 100644 --- a/bindings/python/src/mylib/mylib.cpp +++ b/bindings/python/src/mylib/mylib.cpp @@ -23,7 +23,7 @@ #include -#include +#include PYBIND11_MODULE( opengeode_mymodule_py_mylib, module ) {