fix conflict

Author: randallfrank

CHANGELOG.rst

@@ -2,6 +2,13 @@
 History
 =======
 
+v0.8.0
+------
+* Improved object transmission support
+* Support remote objects: ENS_GROUP, etc
+* Simplified APIs for particle tracing
+* Update documentation for ENS_SCENE and ENS_GEOM objects
+
 v0.7.0
 ------
 * Remove Python 3.8 support. Added Python 3.12 support

doc/source/object_documentation.rst

@@ -35,6 +35,7 @@ operations that can only be performed via that interface.
    ansys.api.pyensight.ens_case.ENS_CASE
    ansys.api.pyensight.ens_flipbook.ENS_FLIPBOOK
    ansys.api.pyensight.ens_frame.ENS_FRAME
+   ansys.api.pyensight.ens_geom.ENS_GEOM
    ansys.api.pyensight.ens_globals.ENS_GLOBALS
    ansys.api.pyensight.ens_group.ENS_GROUP
    ansys.api.pyensight.ens_lightsource.ENS_LIGHTSOURCE
@@ -68,6 +69,7 @@ operations that can only be performed via that interface.
    ansys.api.pyensight.ens_polyline.ENS_POLYLINE
    ansys.api.pyensight.ens_probe.ENS_PROBE
    ansys.api.pyensight.ens_query.ENS_QUERY
+   ansys.api.pyensight.ens_scene.ENS_SCENE
    ansys.api.pyensight.ens_source.ENS_SOURCE
    ansys.api.pyensight.ens_spec.ENS_SPEC
    ansys.api.pyensight.ens_state.ENS_STATE

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "ansys-pyensight-core"
-version = "0.7.3"
+version = "0.8.0.dev0"
 description = "A python wrapper for Ansys EnSight"
 readme = "README.rst"
 requires-python = ">=3.9,<4"
@@ -27,7 +27,7 @@ classifiers = [
 
 dependencies = [
     "importlib-metadata>=4.0; python_version<='3.8'",
-    "ansys-api-pyensight==0.3.2",
+    "ansys-api-pyensight==0.3.3",
     "requests>=2.28.2",
     "docker>=6.1.0",
     "urllib3<2",

tests/unit_tests/test_session.py

@@ -215,19 +215,19 @@ def test_convert_ctor(mocked_session, mocker):
     value = session._convert_ctor("Class: ENS_PART, desc: 'Sphere', CvfObjID: 1078, cached:no")
     assert (
         value
-        == "session.ensight.objs.ENS_PART_MODEL(session, 1078,attr_id=1610612792, attr_value=0)"
+        == "session.ensight.objs.ENS_PART_MODEL(session, 1078,attr_id=1610612795, attr_value=0)"
     )
     cmd.return_value = 3
     value = session._convert_ctor("Class: ENS_ANNOT, desc: 'Pressure', CvfObjID: 4761, cached:no")
     assert (
         value
-        == "session.ensight.objs.ENS_ANNOT_LGND(session, 4761,attr_id=1610612991, attr_value=3)"
+        == "session.ensight.objs.ENS_ANNOT_LGND(session, 4761,attr_id=1610612995, attr_value=3)"
     )
     cmd.return_value = 6
     value = session._convert_ctor("Class: ENS_TOOL, desc: 'Sphere', CvfObjID: 763, cached:no")
     assert (
         value
-        == "session.ensight.objs.ENS_TOOL_SPHERE(session, 763,attr_id=1610613031, attr_value=6)"
+        == "session.ensight.objs.ENS_TOOL_SPHERE(session, 763,attr_id=1610613035, attr_value=6)"
     )
     session._ensobj_hash = {i: i for i in range(10000000)}
     value = session._convert_ctor("Class: ENS_GLOBALS, CvfObjID: 221, cached:yes")