Merge in latest changes from main (#11782)

Merge main into dev after release of 2024.9.1
Includes changes to build related to conflicting Python requirements

ortools is used in the Komodo environment. This environment is not compatible with libprotoc 27 and newer. Use pinning to limit version of libprotoc<27.

Add dependency on typing_extensions

.github/workflows/ResInsightWithCache.yml

@@ -94,7 +94,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r GrpcInterface/Python/dev-requirements.txt
+          pip install -r GrpcInterface/Python/build-requirements.txt
 
       - name: Use CMake
         uses: lukka/get-cmake@latest

GrpcInterface/Python/build-requirements.txt

@@ -0,0 +1,8 @@
+grpcio
+grpcio-tools<1.64 # to make sure we use libprotoc 26.1, to display version info use 'python -m grpc_tools.protoc --version'
+protobuf>=5.26.1,<5.27 # use same requirements as ortools https://github.com/google/or-tools/blob/stable/ortools/python/setup.py.in
+wheel
+typing-extensions
+pytest
+setuptools>=70.0.0 # not directly required, pinned by Snyk to avoid a vulnerability
+packaging>=22.0 # https://github.com/pypa/setuptools/issues/4483

GrpcInterface/Python/setup.py.cmake

@@ -6,7 +6,7 @@ with open('README.md') as f:
 with open('LICENSE') as f:
     license = f.read()
 
-RIPS_DIST_VERSION = '2'
+RIPS_DIST_VERSION = '3'
 	
 setup(
     name='rips',
@@ -19,6 +19,6 @@ setup(
     license=license,
     packages=['rips'],
     package_data={'rips': ['py.typed', '*.py', 'generated/*.py', 'PythonExamples/*.py', 'tests/*.py']},
-    install_requires=['grpcio', 'protobuf', 'wheel'],
+    install_requires=['grpcio', 'protobuf', 'wheel', 'typing_extensions'],
     python_requires='>=3.8',
 )