polyhedral-gravity 3.3rc2__tar.gz → 3.3.1rc1__tar.gz

{polyhedral_gravity-3.3rc2 → polyhedral_gravity-3.3.1rc1}/CMakeLists.txt

@@ -48,7 +48,7 @@ if (_LIBCPP_DISABLE_AVAILABILITY)
     add_definitions(-D_LIBCPP_DISABLE_AVAILABILITY)
 endif ()
 
-if (${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang")
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" AND (${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang"))
     # Fixes undefined _VSTD when using Apple Clang 17
     message(STATUS "Using Apple Clang compiler. Defining _VSTD=std.")
     add_definitions(-D_VSTD=std)

{polyhedral_gravity-3.3rc2/polyhedral_gravity.egg-info → polyhedral_gravity-3.3.1rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyhedral_gravity
-Version: 3.3rc2
+Version: 3.3.1rc1
 Summary: Package to compute full gravity tensor of a given constant density polyhedron for arbitrary points according to the geodetic convention
 Author: Jonas Schuhmacher
 Author-email: jonas.schuhmacher@tum.de
@@ -19,7 +19,7 @@ Classifier: Operating System :: MacOS
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering :: Physics
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: author

{polyhedral_gravity-3.3rc2 → polyhedral_gravity-3.3.1rc1}/cmake/git.cmake

@@ -1,7 +1,12 @@
-find_package(Git QUIET REQUIRED)
+find_package(Git QUIET)
 
 function(get_git_commit_hash OUTPUT_VAR)
     # Run a Git command to get the first 8 characters of the current commit hash
+    if(NOT GIT_FOUND OR NOT GIT_EXECUTABLE)
+        set(${OUTPUT_VAR} "Unknown" PARENT_SCOPE)
+        return()
+    endif()
+
     execute_process(
             COMMAND ${GIT_EXECUTABLE} rev-parse --short=8 HEAD
             WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -23,6 +28,11 @@ endfunction()
 
 function(is_git_working_tree_clean OUTPUT_VAR)
     # Run a Git command to check if the working tree is clean
+    if(NOT GIT_FOUND OR NOT GIT_EXECUTABLE)
+        set(${OUTPUT_VAR} "Unknown" PARENT_SCOPE)
+        return()
+    endif()
+
     execute_process(
             COMMAND ${GIT_EXECUTABLE} diff-index --quiet HEAD --
             WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -43,4 +53,29 @@ function(is_git_working_tree_clean OUTPUT_VAR)
             message(WARNING "Error while checking Git working tree: ${GIT_ERROR}")
         endif()
     endif()
+endfunction()
+
+function(get_git_version_tag OUTPUT_VAR)
+    # Runs a git command to return the latest version number (given the most similar git tag)
+    if(NOT GIT_FOUND OR NOT GIT_EXECUTABLE)
+        set(${OUTPUT_VAR} "Unknown" PARENT_SCOPE)
+        return()
+    endif()
+
+    execute_process(
+            COMMAND git describe --tags --abbrev=0
+            --match v[0-9]*.[0-9]*.[0-9]*        # plain
+            --match v[0-9]*.[0-9]*.[0-9]*a*      # alpha
+            --match v[0-9]*.[0-9]*.[0-9]*b*      # beta
+            --match v[0-9]*.[0-9]*.[0-9]*rc*     # release candidate
+            --match v[0-9]*.[0-9]*.[0-9]*.post*  # post
+            --match v[0-9]*.[0-9]*.[0-9]*.dev*   # dev
+            OUTPUT_VARIABLE GIT_TAG
+            ERROR_VARIABLE GIT_TAG_ERR
+            RESULT_VARIABLE GIT_TAG_RES
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    string(LENGTH ${GIT_TAG} TAG_LENGTH)
+    string(SUBSTRING ${GIT_TAG} 1 ${TAG_LENGTH} VERSION_NUMBER)
+    set(${OUTPUT_VAR} "${VERSION_NUMBER}" PARENT_SCOPE)
 endfunction()

{polyhedral_gravity-3.3rc2 → polyhedral_gravity-3.3.1rc1/polyhedral_gravity.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyhedral_gravity
-Version: 3.3rc2
+Version: 3.3.1rc1
 Summary: Package to compute full gravity tensor of a given constant density polyhedron for arbitrary points according to the geodetic convention
 Author: Jonas Schuhmacher
 Author-email: jonas.schuhmacher@tum.de
@@ -19,7 +19,7 @@ Classifier: Operating System :: MacOS
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering :: Physics
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: author

{polyhedral_gravity-3.3rc2 → polyhedral_gravity-3.3.1rc1}/setup.py

@@ -55,7 +55,21 @@ def get_cmake_generator():
     else:
         return None
 
-def get_version():
+def get_git_version():
+    """Returns the version of the polyhedral gravity package by using git describe"""
+    version_string = subprocess.check_output([
+        "git", "describe", "--tags", "--abbrev=0",
+        "--match", "v[0-9]*.[0-9]*.[0-9]*",        # plain
+        "--match", "v[0-9]*.[0-9]*.[0-9]*a*",      # alpha
+        "--match", "v[0-9]*.[0-9]*.[0-9]*b*",      # beta
+        "--match", "v[0-9]*.[0-9]*.[0-9]*rc*",     # release candidate
+        "--match", "v[0-9]*.[0-9]*.[0-9]*.post*",  # post
+        "--match", "v[0-9]*.[0-9]*.[0-9]*.dev*",   # dev
+    ]).decode("utf-8").strip()
+    # Remove the leading "v"
+    return version_string[1:]
+
+def get_cmake_version():
     """Returns the version of the polyhedral gravity package by reading the CMake file."""
     # Path to the CMake file
     cmake_file = os.path.join(os.path.dirname(__file__), "version.cmake" )
@@ -69,7 +83,7 @@ def get_version():
         content = file.read()
 
     # Use regex to extract the PROJECT_VERSION
-    version_match = re.search(r'set\(PROJECT_VERSION\s+([^\s)]+)\)', content)
+    version_match = re.search(r'set\(POLYHEDRAL_GRAVITY_VERSION\s+"(.*)"', content)
     if version_match:
         return version_match.group(1)
     else:
@@ -196,7 +210,7 @@ picture_in_readme = '''<p align="center">
 # --------------------------------------------------------------------------------
 setup(
     name="polyhedral_gravity",
-    version=get_version(),
+    version=get_cmake_version(),
     author="Jonas Schuhmacher",
     author_email="jonas.schuhmacher@tum.de",
     description="Package to compute full gravity tensor of a given constant density polyhedron for arbitrary points "
@@ -208,7 +222,7 @@ setup(
     license="GPLv3",
     license_file="LICENSE",
     zip_safe=False,
-    python_requires=">=3.8",
+    python_requires=">=3.9",
     include_package_data=True,
     project_urls={
         "Homepage": "https://github.com/esa/polyhedral-gravity-model",

{polyhedral_gravity-3.3rc2 → polyhedral_gravity-3.3.1rc1}/src/polyhedralGravity/input/MeshReader.cpp

@@ -6,6 +6,12 @@
 namespace polyhedralGravity {
 
     PolyhedralSource MeshReader::getPolyhedralSource(const std::vector<std::string> &fileNames) {
+        // Input Sanity Check if the files exists
+        for (const auto &fileName: fileNames) {
+            if (!std::filesystem::exists(fileName)) {
+                throw std::runtime_error("File '" + fileName + "' does not exist.");
+            }
+        }
         switch (fileNames.size()) {
             case 0:
                 throw std::runtime_error("No mesh file given");

{polyhedral_gravity-3.3rc2 → polyhedral_gravity-3.3.1rc1}/src/polyhedralGravity/input/MeshReader.h

@@ -11,6 +11,7 @@
 #include "polyhedralGravity/util/UtilityContainer.h"
 #include <exception>
 #include <stdexcept>
+#include <filesystem>
 
 namespace polyhedralGravity {
 
@@ -23,7 +24,8 @@ namespace polyhedralGravity {
          * Returns a polyhedral source consisting of vertices and faces by reading mesh input files.
          * @param fileNames files specifying a polyhedron
          * @return polyhedral source consisting of vertices and faces
-         * @throws std::invalid_argument exception if the file type is unsupported by the implementation
+         * @throws std::invalid_argument if the file type is unsupported by the implementation
+         * @throws std::runtime_error if the provided files do not exist
          */
         PolyhedralSource getPolyhedralSource(const std::vector<std::string> &fileNames);
 

{polyhedral_gravity-3.3rc2 → polyhedral_gravity-3.3.1rc1}/src/polyhedralGravityPython/PolyhedralGravityPython.cpp

@@ -175,6 +175,7 @@ PYBIND11_MODULE(polyhedral_gravity, m) {
 
             Raises:
                 ValueError: If :code:`integrity_check` is set to :code:`AUTOMATIC` or :code:`VERIFY` and the mesh is inconsistent
+                RuntimeError: If files given as :code:`polyhedral_source` do not exist
 
             Note:
                 The :code:`integrity_check` is automatically enabled to avoid wrong results due to the wrong vertex ordering.