Merge branch 'main' into nk/websocket_dynamic

.github/workflows/conda.yml

@@ -18,6 +18,9 @@ on:
       - README.md
       - "docs/**"
   workflow_dispatch:
+  schedule:
+    # Run conda CI on Monday and Thursday at 1:25am EST (06:25 UTC)
+    - cron: '25 6 * * 1,4'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

Makefile

@@ -203,10 +203,8 @@ dependencies-fedora:  ## install dependencies for linux
 dependencies-vcpkg:  ## install dependencies via vcpkg
 	cd vcpkg && ./bootstrap-vcpkg.sh && ./vcpkg install
 
-## TODO remove pin on cmake below once we identify why 3.31.2 is failing OR cmake releases a new version which installs properly
 dependencies-win:  ## install dependencies via windows
-	choco install cmake --version=3.31.1
-	choco install curl winflexbison ninja unzip zip --no-progress -y
+	choco install cmake curl winflexbison ninja unzip zip --no-progress -y
 
 ############################################################################################
 # Thanks to Francoise at marmelab.com for this

conda/dev-environment-unix.yml

@@ -57,3 +57,4 @@ dependencies:
  - unzip
  - wheel
  - zip
+ - zlib

conda/dev-environment-win.yml

@@ -53,3 +53,4 @@ dependencies:
  - twine
  - typing-extensions
  - wheel
+ - zlib

cpp/csp/python/PyPushInputAdapter.cpp

@@ -145,8 +145,9 @@ class TypedPyPushInputAdapter : public PyPushInputAdapter
 {
 public:
     TypedPyPushInputAdapter( Engine * engine, AdapterManager * manager, PyObjectPtr pyadapter, PyObject * pyType,
-                             PushMode pushMode, PushGroup * pushGroup ):
-        PyPushInputAdapter( engine, manager, pyadapter, pyType, pushMode, pushGroup )
+                             PushMode pushMode, PyObjectPtr pyPushGroup, PushGroup * pushGroup ):
+        PyPushInputAdapter( engine, manager, pyadapter, pyType, pushMode, pushGroup ),
+        m_pyPushGroup( pyPushGroup )
     {
     }
 
@@ -164,6 +165,9 @@ class TypedPyPushInputAdapter : public PyPushInputAdapter
                        << pyTypeToString( m_pyType.ptr() ) << "\" got type \"" << Py_TYPE( value ) -> tp_name << "\"" );
         }
     }
+
+private:
+    PyObjectPtr m_pyPushGroup;
 };
 
 struct PyPushInputAdapter_PyObject
@@ -289,7 +293,7 @@ static InputAdapter * pypushinputadapter_creator( csp::AdapterManager * manager,
                   [&]( auto tag )
                   {
                       pyAdapter -> adapter = pyengine -> engine() -> createOwnedObject<TypedPyPushInputAdapter<typename decltype(tag)::type>>( 
-                          manager, PyObjectPtr::own( ( PyObject * ) pyAdapter ), pyType, pushMode, pushGroup );
+                          manager, PyObjectPtr::own( ( PyObject * ) pyAdapter ), pyType, pushMode, PyObjectPtr::incref( pyPushGroup ), pushGroup );
                   } );
 
     return pyAdapter -> adapter;

cpp/csp/python/PyPushPullInputAdapter.cpp

@@ -61,8 +61,9 @@ class TypedPyPushPullInputAdapter : public PyPushPullInputAdapter
 {
 public:
     TypedPyPushPullInputAdapter( Engine * engine, AdapterManager * manager, PyObjectPtr pyadapter, PyObject * pyType,
-                                 PushMode pushMode, PushGroup * pushGroup ):
-        PyPushPullInputAdapter( engine, manager, pyadapter, pyType, pushMode, pushGroup )
+                                 PushMode pushMode, PyObjectPtr pyPushGroup, PushGroup * pushGroup ):
+        PyPushPullInputAdapter( engine, manager, pyadapter, pyType, pushMode, pushGroup ),
+        m_pyPushGroup( pyPushGroup )
     {
     }
 
@@ -80,6 +81,9 @@ class TypedPyPushPullInputAdapter : public PyPushPullInputAdapter
                        << pyTypeToString( m_pyType.ptr() ) << "\" got type \"" << Py_TYPE( value ) -> tp_name << "\"" );
         }
     }
+
+private:
+    PyObjectPtr m_pyPushGroup;
 };
 
 struct PyPushPullInputAdapter_PyObject
@@ -208,7 +212,7 @@ static InputAdapter * pypushpullinputadapter_creator( csp::AdapterManager * mana
                   [&]( auto tag )
                   {
                       pyAdapter -> adapter = pyengine -> engine() -> createOwnedObject<TypedPyPushPullInputAdapter<typename decltype(tag)::type>>( 
-                          manager, PyObjectPtr::own( ( PyObject * ) pyAdapter ), pyType, pushMode, pushGroup );
+                          manager, PyObjectPtr::own( ( PyObject * ) pyAdapter ), pyType, pushMode, PyObjectPtr::incref( pyPushGroup ), pushGroup );
                   } );
 
     return pyAdapter -> adapter;