Updated rapidjson to version that has header directory renamed

Updated pyproject.toml to fix version created via setuptools_scm
Fixed version

Author: langmm

CMakeLists.txt

@@ -21,7 +21,7 @@ if (${PYTHON_PREFIX}_VERSION VERSION_LESS "3.9.0")
 endif()
 
 set(PYRJ_TARGET "yggdrasil_python_rapidjson")
-set(PYRJ_SRC "${CMAKE_CURRENT_SOURCE_DIR}/rapidjson.cpp")
+set(PYRJ_SRC "${CMAKE_CURRENT_SOURCE_DIR}/yggdrasil_rapidjson.cpp")
 
 if (PYRJ_ALTERNATE_MODULE)
   if (NOT PYRJ_LIBNAME)
@@ -70,7 +70,7 @@ if (PYRJ_ALTERNATE_MODULE)
 	        -P "${CMAKE_CURRENT_BINARY_DIR}/replace_module.cmake"
 	        DEPENDS "${src}" "${CMAKE_CURRENT_BINARY_DIR}/replace_module.cmake")
     endforeach()
-    set(PYRJ_SRC "${CMAKE_CURRENT_BINARY_DIR}/rapidjson.cpp")
+    set(PYRJ_SRC "${CMAKE_CURRENT_BINARY_DIR}/yggdrasil_rapidjson.cpp")
     add_custom_target(alt_rapidjson DEPENDS ${ALT_PYRJ_CPP})
   endif()
 endif()
@@ -108,7 +108,9 @@ target_compile_options(
   -DYGGDRASIL_RAPIDJSON_PYTHON_WRAPPER
   -DYGGDRASIL_RAPIDJSON_HAS_STDSTRING
   -DNPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION
-  -D_USE_MATH_DEFINES)
+  -D_USE_MATH_DEFINES
+  -DYGGDRASIL_RAPIDJSON_PYTHON_VERSION=${CMAKE_PROJECT_VERSION}
+)
 if (YGGDRASIL_RAPIDJSON_EXACT_VERSION)
   target_compile_options(
     ${PYRJ_TARGET} PUBLIC

cmake/ygg_options.cmake

@@ -78,7 +78,7 @@ option(YGGDRASIL_RAPIDJSON_CHECK_PYREFS "Turn on reference counting in rapidjson
 
 message(STATUS "YGGDRASIL_RAPIDJSON_INCLUDE_DIRS = ${YGGDRASIL_RAPIDJSON_INCLUDE_DIRS}")
 if (NOT EXISTS ${YGGDRASIL_RAPIDJSON_INCLUDE_DIRS})
-  message(FATAL_ERROR "RapidJSON sources not found: if you cloned "
+  message(FATAL_ERROR "YggdrasilRapidJSON sources not found: if you cloned "
                       " the git repository, you should initialize"
                       " the rapidjson submodule as explained in the"
                       " README.rst; in all other cases you may"

geometry.cpp

@@ -10,10 +10,10 @@
 
 #include <Python.h>
 
-#include "rapidjson/ply.h"
-#include "rapidjson/obj.h"
-#include "rapidjson/precision.h"
-#include "rapidjson/rapidjson.h"
+#include "yggdrasil_rapidjson/ply.h"
+#include "yggdrasil_rapidjson/obj.h"
+#include "yggdrasil_rapidjson/precision.h"
+#include "yggdrasil_rapidjson/yggdrasil_rapidjson.h"
 
 
 using namespace yggdrasil_rapidjson;
@@ -3845,7 +3845,7 @@ geom_module_exec(PyObject* m)
 #define XSTRINGIFY(x) #x
 
     if (PyModule_AddStringConstant(m, "__version__",
-				   STRINGIFY(YGGDRASIL_PYTHON_RAPIDJSON_VERSION))
+				   STRINGIFY(YGGDRASIL_RAPIDJSON_PYTHON_VERSION))
         || PyModule_AddStringConstant(m, "__author__",
 				      "Meagan Lang <langmm.astro@gmail.com>")
         || PyModule_AddStringConstant(m, "__yggdrasil_rapidjson_version__",

pyproject.toml

@@ -56,9 +56,10 @@ editable.verbose = true
 # yggdrasil-rapidjson-stubs = "typings/rapidjson-stubs"
 
 [tool.setuptools_scm]
-# version_file = "_version.py"
-write_to = "_version.py"
-git_describe_command = "git describe --tags --long --abbrev=0"
+version_file = "_version.py"
+# write_to = "_version.py"
+# scm.git.describe_command = "git describe --tags --long --abbrev=0"
+scm.git.describe_command = "git describe --tags --abbrev=0"
 
 [tool.hatch.metadata.hooks.fancy-pypi-readme]
 content-type = "text/x-rst"

rapidjson

@@ -10,9 +10,9 @@
 
 #include <Python.h>
 
-#include "rapidjson/units.h"
-#include "rapidjson/precision.h"
-#include "rapidjson/rapidjson.h"
+#include "yggdrasil_rapidjson/units.h"
+#include "yggdrasil_rapidjson/precision.h"
+#include "yggdrasil_rapidjson/yggdrasil_rapidjson.h"
 #include <numpy/arrayobject.h>
 #include <numpy/ufuncobject.h>
 
@@ -2711,7 +2711,7 @@ units_module_exec(PyObject* m)
 #define XSTRINGIFY(x) #x
 
     if (PyModule_AddStringConstant(m, "__version__",
-				   STRINGIFY(YGGDRASIL_PYTHON_RAPIDJSON_VERSION))
+				   STRINGIFY(YGGDRASIL_RAPIDJSON_PYTHON_VERSION))
         || PyModule_AddStringConstant(m, "__author__",
 				      "Meagan Lang <langmm.astro@gmail.com>")
         || PyModule_AddStringConstant(m, "__yggdrasil_rapidjson_version__",

units.cpp

@@ -13,7 +13,7 @@
 #include <locale.h>
 
 #include <Python.h>
-#include "rapidjson/pythoncapi_compat.h"
+#include "yggdrasil_rapidjson/pythoncapi_compat.h"
 #include <datetime.h>
 #include <structmember.h>
 
@@ -28,13 +28,13 @@
 #endif // YGGDRASIL_RAPIDJSON_PYTHON_WRAPPER
 #define PYRJ_TWO_PHASE_INIT
 // #define YGG_ENSURE_PY_GIL
-#include "rapidjson/pyrj.h"
-#include "rapidjson/reader.h"
-#include "rapidjson/schema.h"
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/writer.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/error/en.h"
+#include "yggdrasil_rapidjson/pyrj.h"
+#include "yggdrasil_rapidjson/reader.h"
+#include "yggdrasil_rapidjson/schema.h"
+#include "yggdrasil_rapidjson/stringbuffer.h"
+#include "yggdrasil_rapidjson/writer.h"
+#include "yggdrasil_rapidjson/prettywriter.h"
+#include "yggdrasil_rapidjson/error/en.h"
 #include "units.cpp"
 #include "geometry.cpp"
 
@@ -7095,7 +7095,7 @@ module_exec(PyObject* m)
 	|| PyModule_AddIntConstant(m, "SIZE_OF_SIZE_T", SIZE_OF_SIZE_T)
 
         || PyModule_AddStringConstant(m, "__version__",
-                                      STRINGIFY(YGGDRASIL_PYTHON_RAPIDJSON_VERSION))
+                                      STRINGIFY(YGGDRASIL_RAPIDJSON_PYTHON_VERSION))
         || PyModule_AddStringConstant(m, "__author__",
                                       "Meagan Lang <langmm@illinois.edu> [yggdrasil-rapidjson]"
                                       ", Ken Robbins <ken@kenrobbins.com> [rapidjson]"