Switch to PyAwaitable PyPI build.

Author: ZeroIntensity

CMakeLists.txt

@@ -15,8 +15,12 @@ find_package(
 # Link Python
 python_add_library(_view MODULE ${_view_SRC} WITH_SOABI)
 
+# Settings
+add_compile_definitions(PYAWAITABLE_PYAPI)
+
 # Add include directories
 target_include_directories(_view PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include/)
+target_include_directories(_view PUBLIC $ENV{PYAWAITABLE_INCLUDE_DIR})
 
 # Install extension module
-install(TARGETS _view DESTINATION .)
+install(TARGETS _view DESTINATION .)

hatch.toml

@@ -10,6 +10,10 @@ packages = ["src/view"]
 [build.targets.wheel.force-include]
 "_view.pyi" = "_view.pyi"
 
+[metadata.hooks.custom]
+path = "hatch_build.py"
+enable-by-default = true
+
 [build.targets.wheel.hooks.scikit-build]
 experimental = true
 

hatch_build.py

@@ -0,0 +1,7 @@
+from hatchling.metadata.plugin.interface import MetadataHookInterface
+import pyawaitable
+import os
+
+class JSONMetaDataHook(MetadataHookInterface):
+    def update(self, *_) -> None:
+        os.environ["PYAWAITABLE_INCLUDE_DIR"] = pyawaitable.include()

include/view/pyawaitable.h

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["scikit-build-core>=0.9.0", "hatchling"]
+requires = ["scikit-build-core>=0.9.0", "hatchling", "pyawaitable"]
 build-backend = "hatchling.build"
 
 [project]
@@ -28,6 +28,7 @@ dependencies = [
     "configzen",
     "aiofiles",
     "prompts.py",
+    "pyawaitable"
 ]
 dynamic = ["version", "license"]
 
@@ -73,7 +74,5 @@ view = "view.__main__:main"
 view-py = "view.__main__:main"
 
 [tool.pytest.ini_options]
-pystack_threshold=60
-pystack_path="custom-version-of-pystack"
-pystack_output_file="./pystack.log"
-pystack_args="--native"
+pystack_threshold = 60
+pystack_args = "--native"

pyproject.toml

@@ -1 +1 @@
-hatch
+hatch

requirements.txt

@@ -39,9 +39,10 @@
 #include <view/results.h> // pymem_strdup
 #include <view/handling.h> // route_free, route_new, handle_route, handle_route_query
 #include <view/map.h>
-#include <view/pyawaitable.h>
 #include <view/view.h> // VIEW_FATAL
 
+#include <pyawaitable.h>
+
 #define LOAD_ROUTE(target)                                                  \
         char *path;                                                         \
         PyObject *callable;                                                 \
@@ -265,9 +266,11 @@ lifespan(PyObject *awaitable, PyObject *result)
     Py_DECREF(send_dict);
 
     if (
-        PyAwaitable_AWAIT(
+        PyAwaitable_AddAwait(
             awaitable,
-            send_coro
+            send_coro,
+            NULL,
+            NULL
         ) < 0
     )
     {
@@ -763,9 +766,11 @@ app(
         }
 
         if (
-            PyAwaitable_AWAIT(
+            PyAwaitable_AddAwait(
                 awaitable,
-                coro
+                coro,
+                NULL,
+                NULL
             ) < 0
         )
         {
@@ -833,9 +838,11 @@ app(
         }
 
         if (
-            PyAwaitable_AWAIT(
+            PyAwaitable_AddAwait(
                 awaitable,
-                coro
+                coro,
+                NULL,
+                NULL
             ) < 0
         )
         {