Merge branch 'main' into release/0.6

RobPasMue · RobPasMue · commit 8e964ce42760 · 2024-06-18T15:28:27.000+02:00
diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
@@ -285,7 +285,7 @@ jobs:
         run:
           echo "ANSRV_GEO_LICENSE_SERVER=${{ secrets.INTERNAL_LICENSE_SERVER }}" | Out-File -FilePath $env:GITHUB_ENV -Append
 
-      - name: Start Geometry service
+      - name: Start Geometry service and verify start
         run: docker run --detach --name ${{ env.GEO_CONT_NAME }} -e LICENSE_SERVER=${{ env.ANSRV_GEO_LICENSE_SERVER }} -p ${{ env.ANSRV_GEO_PORT }}:50051 ${{ env.ANSRV_GEO_IMAGE_WINDOWS_TAG }}
 
       - name: Run Ansys documentation building action
@@ -310,6 +310,7 @@ jobs:
               docker rm $dockerContainers
           }
 
+
 # =================================================================================================
 # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    RUNNING ON SELF-HOSTED RUNNER    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 # =================================================================================================
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -23,7 +23,7 @@ repos:
   - id: isort
 
 - repo: https://github.com/PyCQA/flake8
-  rev: 7.0.0
+  rev: 7.1.0
   hooks:
   - id: flake8
 
@@ -64,7 +64,7 @@ repos:
 
 # this validates our github workflow files
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.28.4
+  rev: 0.28.5
   hooks:
     - id: check-github-workflows
 
diff --git a/doc/Makefile b/doc/Makefile
@@ -32,5 +32,8 @@ pdf:
 
 # Build HTML files and generate examples as .py files
 html:
-	@$(SPHINXBUILD) -M linkcheck "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 	@$(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+# Linkcheck
+linkcheck:
+	@$(SPHINXBUILD) -M linkcheck "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/doc/changelog.d/1263.changed.md b/doc/changelog.d/1263.changed.md
@@ -0,0 +1 @@
+chore: update CHANGELOG for v0.6.2
diff --git a/doc/changelog.d/1264.fixed.md b/doc/changelog.d/1264.fixed.md
@@ -0,0 +1 @@
+fix: unnecessary Point3D comparison
diff --git a/doc/changelog.d/1265.changed.md b/doc/changelog.d/1265.changed.md
@@ -0,0 +1 @@
+build: adapting to numpy 2.x
diff --git a/doc/changelog.d/1266.dependencies.md b/doc/changelog.d/1266.dependencies.md
@@ -0,0 +1 @@
+build: bump numpy from 1.26.4 to 2.0.0
diff --git a/doc/changelog.d/1267.miscellaneous.md b/doc/changelog.d/1267.miscellaneous.md
@@ -0,0 +1 @@
+chore: pre-commit automatic update
diff --git a/doc/changelog.d/1268.fixed.md b/doc/changelog.d/1268.fixed.md
@@ -0,0 +1 @@
+docs: examples are not being uploaded as assets (.py/.ipynb)
diff --git a/doc/changelog.d/1269.fixed.md b/doc/changelog.d/1269.fixed.md
@@ -0,0 +1 @@
+fix: change action order
diff --git a/doc/changelog.d/1270.changed.md b/doc/changelog.d/1270.changed.md
@@ -0,0 +1 @@
+docs: using ansys actions (again) to build docs
diff --git a/doc/changelog.d/1271.dependencies.md b/doc/changelog.d/1271.dependencies.md
@@ -0,0 +1 @@
+build: bump the docs-deps group with 2 updates
diff --git a/doc/make.bat b/doc/make.bat
@@ -15,9 +15,11 @@ set APIDIR=api
 set BUILDDIR=_build
 
 if "%1" == "" goto help
+if "%1" == "help" goto help
 if "%1" == "clean" goto clean
 if "%1" == "pdf" goto pdf
 if "%1" == "html" goto html
+if "%1" == "linkcheck" goto linkcheck
 
 %SPHINXBUILD% >NUL 2>NUL
 if errorlevel 9009 (
@@ -35,9 +37,12 @@ if errorlevel 9009 (
 %SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
 goto end
 
+:linkcheck
+%SPHINXBUILD% -M linkcheck %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+goto end
+
 :html
 %SPHINXBUILD% -M html %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
-%SPHINXBUILD% -M linkcheck %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
 goto end
 
 :pdf
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -18,9 +18,14 @@
 import requests
 import sphinx
 from sphinx.builders.latex import LaTeXBuilder
+from sphinx.util import logging
 
 from ansys.geometry.core import __version__
 
+# Convert notebooks into Python scripts and include them in the output files
+logger = logging.getLogger(__name__)
+
+
 # For some reason the global var is not working on doc build...
 # import ansys.tools.visualization_interface as viz_interface
 #
@@ -393,9 +398,15 @@ def convert_notebooks_to_scripts(app: sphinx.application.Sphinx, exception):
         import subprocess
 
         examples_output_dir = Path(app.outdir) / "examples"
+        if not examples_output_dir.exists():
+            logger.info("No examples directory found, skipping conversion...")
+            return
+
         notebooks = examples_output_dir.glob("**/*.ipynb")
+        count = 0
         for notebook in notebooks:
-            print(f"Converting {notebook}")  # using jupytext
+            count += 1
+            logger.info(f"Converting {notebook}")  # using jupytext
             output = subprocess.run(
                 [
                     "jupytext",
@@ -410,8 +421,13 @@ def convert_notebooks_to_scripts(app: sphinx.application.Sphinx, exception):
             )
 
             if output.returncode != 0:
-                print(f"Error converting {notebook} to script")
-                print(output.stderr)
+                logger.error(f"Error converting {notebook} to script")
+                logger.error(output.stderr)
+
+        if count == 0:
+            logger.warning("No notebooks found to convert to scripts")
+        else:
+            logger.info(f"Converted {count} notebooks to scripts")
 
 
 def setup(app: sphinx.application.Sphinx):
@@ -423,7 +439,8 @@ def setup(app: sphinx.application.Sphinx):
     app : sphinx.application.Sphinx
         Sphinx instance containing all the configuration for the documentation build.
     """
-    # Convert notebooks into Python scripts and include them in the output files
+    logger.info(f"Configuring Sphinx hooks...")
     if BUILD_EXAMPLES:
         # Run at the end of the build process
+        logger.info("Connecting build-finished hook for converting notebooks to scripts...")
         app.connect("build-finished", convert_notebooks_to_scripts)
diff --git a/pyproject.toml b/pyproject.toml
@@ -30,7 +30,8 @@ dependencies = [
     "beartype>=0.11.0,<0.19",
     "grpcio>=1.35.0,<2",
     "grpcio-health-checking>=1.45.0,<2",
-    "numpy>=1.20.3,<2",
+    "numpy>=1.20.3,<3; python_version>='3.10'",
+    "numpy>=1.20.3,<2; python_version=='3.9'",       # Remove when Python 3.9 support is dropped
     "Pint>=0.18,<1",
     "protobuf>=3.20.2,<6",
     "pyvista>=0.37.0,<1",
@@ -55,14 +56,14 @@ tests = [
     "docker==7.1.0",
     "grpcio==1.64.1",
     "grpcio-health-checking==1.60.0",
-    "numpy==1.26.4",
+    "numpy==2.0.0",
     "Pint==0.24",
     "protobuf==5.27.1",
     "pytest==8.2.2",
     "pytest-cov==5.0.0",
     "pytest-pyvista==0.1.9",
     "pytest-xvfb==3.0.0",
-    "pyvista[jupyter]==0.43.9",
+    "pyvista[jupyter]==0.43.10",
     "requests==2.32.3",
     "scipy==1.13.1",
     "semver==3.0.2",
@@ -76,7 +77,7 @@ tests-minimal = [
     "pytest-xvfb==3.0.0",
 ]
 doc = [
-    "ansys-sphinx-theme[autoapi]==0.16.5",
+    "ansys-sphinx-theme[autoapi]==0.16.6",
     "ansys-tools-visualization-interface==0.2.6",
     "beartype==0.18.5",
     "docker==7.1.0",
@@ -89,7 +90,7 @@ doc = [
     "notebook==7.2.1",
     "numpydoc==1.7.0",
     "panel==1.4.4",
-    "pyvista[jupyter]==0.43.9",
+    "pyvista[jupyter]==0.43.10",
     "requests==2.32.3",
     "sphinx==7.3.7",
     "sphinx-autodoc-typehints==1.24.0",
diff --git a/src/ansys/geometry/core/shapes/curves/line.py b/src/ansys/geometry/core/shapes/curves/line.py
@@ -192,7 +192,7 @@ def parameterization(self) -> Parameterization:
         Parameterization
             Information about how the line is parameterized.
         """
-        return Parameterization(ParamForm.OPEN, ParamType.LINEAR, Interval(np.NINF, np.inf))
+        return Parameterization(ParamForm.OPEN, ParamType.LINEAR, Interval(-np.inf, np.inf))
 
     def contains_param(self, param: Real) -> bool:  # noqa: D102
         raise NotImplementedError("contains_param() is not implemented.")
diff --git a/src/ansys/geometry/core/shapes/parameterization.py b/src/ansys/geometry/core/shapes/parameterization.py
@@ -204,7 +204,7 @@ def is_closed(self) -> bool:
         bool
             True if neither bound of the interval is infinite.
         """
-        return self.start > np.NINF and self.end < np.inf
+        return self.start > -np.inf and self.end < np.inf
 
     def is_empty(self) -> bool:
         """
diff --git a/src/ansys/geometry/core/shapes/surfaces/cone.py b/src/ansys/geometry/core/shapes/surfaces/cone.py
@@ -254,7 +254,7 @@ def parameterization(self) -> Tuple[Parameterization, Parameterization]:
         u = Parameterization(ParamForm.PERIODIC, ParamType.CIRCULAR, Interval(0, 2 * np.pi))
 
         start, end = (
-            (self.apex_param, np.inf) if self.apex_param < 0 else (np.NINF, self.apex_param)
+            (self.apex_param, np.inf) if self.apex_param < 0 else (-np.inf, self.apex_param)
         )
         v = Parameterization(ParamForm.OPEN, ParamType.LINEAR, Interval(start, end))
 
diff --git a/src/ansys/geometry/core/shapes/surfaces/cylinder.py b/src/ansys/geometry/core/shapes/surfaces/cylinder.py
@@ -263,7 +263,7 @@ def parameterization(self) -> Tuple[Parameterization, Parameterization]:
             Information about how a cylinder's u and v parameters are parameterized, respectively.
         """
         u = Parameterization(ParamForm.PERIODIC, ParamType.CIRCULAR, Interval(0, 2 * np.pi))
-        v = Parameterization(ParamForm.OPEN, ParamType.LINEAR, Interval(np.NINF, np.inf))
+        v = Parameterization(ParamForm.OPEN, ParamType.LINEAR, Interval(-np.inf, np.inf))
 
         return (u, v)
 
diff --git a/src/ansys/geometry/core/shapes/surfaces/plane.py b/src/ansys/geometry/core/shapes/surfaces/plane.py
@@ -111,8 +111,8 @@ def contains_point(self, point: Point3D) -> bool:
 
     def parameterization(self) -> Tuple[Parameterization, Parameterization]:
         """Parametrize the plane."""
-        u = Parameterization(ParamForm.OPEN, ParamType.LINEAR, Interval(np.NINF, np.inf))
-        v = Parameterization(ParamForm.OPEN, ParamType.LINEAR, Interval(np.NINF, np.inf))
+        u = Parameterization(ParamForm.OPEN, ParamType.LINEAR, Interval(-np.inf, np.inf))
+        v = Parameterization(ParamForm.OPEN, ParamType.LINEAR, Interval(-np.inf, np.inf))
 
         return (u, v)
 
diff --git a/src/ansys/geometry/core/shapes/surfaces/sphere.py b/src/ansys/geometry/core/shapes/surfaces/sphere.py
@@ -197,7 +197,7 @@ def project_point(self, point: Point3D) -> "SphereEvaluation":
         x = origin_to_point.dot(self.dir_x)
         y = origin_to_point.dot(self.dir_y)
         z = origin_to_point.dot(self.dir_z)
-        if np.allclose((x * x + y * y + z * z), Point3D([0, 0, 0])):
+        if np.allclose(x * x + y * y + z * z, 0):
             return SphereEvaluation(self, ParamUV(0, np.pi / 2))
 
         u = np.arctan2(y, x)
diff --git a/src/ansys/geometry/core/sketch/box.py b/src/ansys/geometry/core/sketch/box.py
@@ -171,6 +171,6 @@ def visualization_polydata(self) -> pv.PolyData:
                         0,
                     ],
                 ],
-                dtype=np.float_,
+                dtype=np.float64,
             )
         )
diff --git a/src/ansys/geometry/core/sketch/segment.py b/src/ansys/geometry/core/sketch/segment.py
@@ -145,11 +145,15 @@ def visualization_polydata(self) -> pv.PolyData:
                     self.start.y.m_as(DEFAULT_UNITS.LENGTH),
                     0,
                 ],
-                dtype=np.float_,
+                dtype=np.float64,
             ),
             np.array(
-                [self.end.x.m_as(DEFAULT_UNITS.LENGTH), self.end.y.m_as(DEFAULT_UNITS.LENGTH), 0],
-                dtype=np.float_,
+                [
+                    self.end.x.m_as(DEFAULT_UNITS.LENGTH),
+                    self.end.y.m_as(DEFAULT_UNITS.LENGTH),
+                    0,
+                ],
+                dtype=np.float64,
             ),
         )
 
diff --git a/src/ansys/geometry/core/sketch/trapezoid.py b/src/ansys/geometry/core/sketch/trapezoid.py
@@ -203,6 +203,6 @@ def visualization_polydata(self) -> pv.PolyData:
                         0,
                     ],
                 ],
-                dtype=np.float_,
+                dtype=np.float64,
             )
         )
diff --git a/src/ansys/geometry/core/sketch/triangle.py b/src/ansys/geometry/core/sketch/triangle.py
@@ -108,6 +108,6 @@ def visualization_polydata(self) -> pv.PolyData:
                         0,
                     ],
                 ],
-                dtype=np.float_,
+                dtype=np.float64,
             )
         )
diff --git a/tests/test_parameterization.py b/tests/test_parameterization.py
@@ -53,9 +53,9 @@ def test_param_uv():
 
 
 def test_interval():
-    open_interval = Interval(np.NINF, np.inf)
+    open_interval = Interval(-np.inf, np.inf)
     closed_interval = Interval(-1, 1)
-    open_start = Interval(np.NINF, 1)
+    open_start = Interval(-np.inf, 1)
     open_end = Interval(-1, np.inf)
 
     assert np.isneginf(open_interval.start)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+docs: examples are not being uploaded as assets (.py/.ipynb)`