Merge branch 'main' into release/0.8

ansjmoody · ansjmoody · commit 3e207416c383 · 2024-12-10T11:14:04.000-06:00
diff --git a/doc/changelog.d/459.documentation.md b/doc/changelog.d/459.documentation.md
@@ -0,0 +1 @@
+MAINT: Bump pytest from 8.3.3 to 8.3.4
diff --git a/doc/changelog.d/463.documentation.md b/doc/changelog.d/463.documentation.md
@@ -0,0 +1 @@
+MAINT: Bump ansys-sphinx-theme from 1.2.1 to 1.2.3
diff --git a/doc/changelog.d/467.fixed.md b/doc/changelog.d/467.fixed.md
@@ -0,0 +1 @@
+fix: conf.py issue
diff --git a/doc/changelog.d/470.fixed.md b/doc/changelog.d/470.fixed.md
@@ -0,0 +1 @@
+fix: import statements
diff --git a/pyproject.toml b/pyproject.toml
@@ -33,11 +33,11 @@ dependencies = [
 tests = [
     "grpcio==1.67.1",
     "protobuf==5.28.0",
-    "pytest==8.3.3",
+    "pytest==8.3.4",
     "pytest-cov==6.0.0",
 ]
 doc = [
-    "ansys-sphinx-theme==1.2.1",
+    "ansys-sphinx-theme==1.2.3",
     "numpydoc==1.8.0",
     "Sphinx==8.1.3", # BLOCKED BY sphinx-design - Cannot upgrade to Sphinx 7 for now
     "sphinx-copybutton==0.5.2",
diff --git a/src/ansys/sherlock/core/model.py b/src/ansys/sherlock/core/model.py
@@ -13,8 +13,8 @@
     import SherlockModelService_pb2_grpc
 except ModuleNotFoundError:
     from ansys.api.sherlock.v0 import SherlockModelService_pb2
+    from ansys.api.sherlock.v0.SherlockModelService_pb2 import MeshType, TraceOutputType
     from ansys.api.sherlock.v0 import SherlockModelService_pb2_grpc
-    from SherlockModelService_pb2 import MeshType, TraceOutputType
 
 from ansys.sherlock.core import LOG
 from ansys.sherlock.core.errors import (

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+MAINT: Bump ansys-sphinx-theme from 1.2.1 to 1.2.3`