Merge remote-tracking branch 'origin/zzqbranch' into local

Author: zhangzhanqun

.github/workflows/ci_cd.yml

@@ -9,7 +9,7 @@ on:
       - main
 
 env:
-  MAIN_PYTHON_VERSION: '3.9'
+  MAIN_PYTHON_VERSION: '3.10'
   PACKAGE_NAME: 'ansys-dyna-core'
   PACKAGE_NAMESPACE: 'ansys.dyna.core'
   DOCUMENTATION_CNAME: "dyna.docs.pyansys.com"
@@ -24,7 +24,7 @@ jobs:
     name: "Code style"
     runs-on: ubuntu-latest
     steps:
-      - uses: ansys/actions/code-style@v4
+      - uses: ansys/actions/code-style@v5
         with:
           python-version: ${{ env.MAIN_PYTHON_VERSION }}
 
@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: PyAnsys documentation style checks
-        uses: ansys/actions/doc-style@v4
+        uses: ansys/actions/doc-style@v5
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -126,12 +126,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
     steps:
-      - uses: ansys/actions/build-wheelhouse@v4
+      - uses: ansys/actions/build-wheelhouse@v5
         with:
           library-name: ${{ env.PACKAGE_NAME }}
-          library-namespace: ${{ env.PACKAGE_NAMESPACE }}
           operating-system: ${{ matrix.os }}
           python-version: ${{ matrix.python-version }}
 
@@ -194,7 +193,7 @@ jobs:
     needs: [doc, tests]
     runs-on: ubuntu-latest
     steps:
-      - uses: ansys/actions/build-library@v4
+      - uses: ansys/actions/build-library@v5
         with:
           library-name: ${{ env.PACKAGE_NAME }}
           python-version: ${{ env.MAIN_PYTHON_VERSION }}
@@ -206,14 +205,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Release to the public PyPI repository"
-        uses: ansys/actions/release-pypi-public@v4
+        uses: ansys/actions/release-pypi-public@v5
         with:
           library-name: ${{ env.PACKAGE_NAME }}
           twine-username: "__token__"
           twine-token: ${{ secrets.PYPI_TOKEN }}
 
       - name: "Release to GitHub"
-        uses: ansys/actions/release-github@v4
+        uses: ansys/actions/release-github@v5
         with:
           library-name: ${{ env.PACKAGE_NAME }}
 
@@ -223,7 +222,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build-library]
     steps:
-      - uses: ansys/actions/doc-deploy-dev@v4
+      - uses: ansys/actions/doc-deploy-dev@v5
         with:
           cname: ${{ env.DOCUMENTATION_CNAME }}
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -234,8 +233,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [release]
     steps:
-      - uses: ansys/actions/doc-deploy-stable@v4
+      - uses: ansys/actions/doc-deploy-stable@v5
         with:
           cname: ${{ env.DOCUMENTATION_CNAME }}
           token: ${{ secrets.GITHUB_TOKEN }}
-          python-version: ${{ env.MAIN_PYTHON_VERSION }}

doc/source/getting-started/SERVER_PRE_README.rst

@@ -1,9 +1,9 @@
-Start pydyna pre server locally
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Start PyDYNA preprocessing server locally
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Run an example on the client side
 *********************************
- 
+
    .. code:: bash
 
        hostname = "localhost"
@@ -12,4 +12,4 @@ Run an example on the client side
            solution = DynaSolution(hostname)
            ......
 
-#. The function of DynaSolution() will download and start the pre server automatically.
+#. The function of DynaSolution() can download and start the preprocessing server automatically.

doc/source/getting-started/SERVER_SOLVER_README.rst

@@ -1,4 +1,4 @@
-Start pydyna solver server locally
+Start PyDYNA solver server locally
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Prerequisites
@@ -12,13 +12,13 @@ Start server on Windows
 Start server on Linux(Centos7)
 ++++++++++++++++++++++++++++++
 
-#. If you want to start the server on Linux,please ensure that you have installed the openmpi package.
+#. If you want to start the server on Linux,please ensure that you have installed the Open MPI package.
 
    .. code:: bash
 
        yum install openmpi3 openmpi3-dev
 
-#. set environment variable for openmpi
+#. set environment variable for Open MPI
 
    .. code:: bash
 
@@ -38,4 +38,4 @@ Run an example on the client side
        dyna.push("./output/ball_plate.k")        # push an input file
        dyna.start_locally(input = "ball_plate.k",nproc=1) 
 
-#. The function of solver.DynaSolver() will download and start the solver server automatically.
+#. The function of DynaSolver() can download and start the solver server automatically.

doc/source/getting-started/example.rst

@@ -1,8 +1,8 @@
-The next few sections show how to preprocess, solve, and postprocess a ball plate example.
+The next few sections show how to preprocessing, solve, and postprocessing a ball plate example.
 
-Preprocess
-~~~~~~~~~~
-The following code preprocesses a ball plate example. In the repository, you can get the
+Preprocessing
+~~~~~~~~~~~~~
+The following code processes a ball plate example. In the repository, you can get the
 input file from ``src/ansys/dyna/core/pre/examples/explicit/ball_plate/ball_plate.k`` and
 the Python file from ``examples/Explicit/ball_plate.py``.
 
@@ -104,9 +104,9 @@ you can get the Python file from ``examples/solver/ball_plate_solver.py``.
     dyna.run("i=ball_plate.k memory=10m ncycle=20000")   # begin execution
 
 
-Postprocess
-~~~~~~~~~~~
-The following code postprocesses results from the solve of this basic ball plate example:
+Post processing
+~~~~~~~~~~~~~~~
+The following code processes results from the solve of this basic ball plate example:
 
 .. code:: python
 
@@ -138,4 +138,4 @@ The following code postprocesses results from the solve of this basic ball plate
     fields_top.animate()
 
 For more examples, see `Examples <https://dyna.docs.pyansys.com/version/stable/examples/index.html>`_
-in the PyDYNA documentation.
+in the PyDYNA documentation.

doc/source/getting-started/index.rst

@@ -14,8 +14,8 @@ Both these modules are gRPC enabled and hence need to be run using server-client
 
 Install the client
 ------------------
-The ``ansys.dyna.core`` package supports Python 3.8 through
-Python 3.11 on Windows, Linux, and MacOS.
+The ``ansys.dyna.core`` package supports Python 3.9 through
+Python 3.12 on Windows, Linux, and MacOS.
 
 You should consider installing PyDYNA in a virtual environment.
 For more information, see Python's
@@ -66,21 +66,21 @@ PyDYNA by downloading the wheelhouse archive for your corresponding machine
 architecture from the `Releases Page <https://github.com/pyansys/pydyna/releases>`_.
 
 Each wheelhouse archive contains all the Python wheels necessary to install
-PyDYNA from scratch on Windows and Linux for Python 3.8 through 3.11. You can install
+PyDYNA from scratch on Windows and Linux for Python 3.9 through 3.12. You can install
 PyDYNA on an isolated system with a fresh Python installation or on a virtual environment.
 
-For example, on Linux with Python 3.8, unzip the wheelhouse archive and install PyDYNA
+For example, on Linux with Python 3.9, unzip the wheelhouse archive and install PyDYNA
 with these commands:
 
 .. code:: bash
 
-    unzip ansys-dyna-core-v0.3.dev0-wheelhouse-Linux-3.8.zip -d wheelhouse
+    unzip ansys-dyna-core-v0.3.dev0-wheelhouse-Linux-3.9.zip -d wheelhouse
     pip install ansys-dyna-core -f wheelhouse --no-index --upgrade --ignore-installed
 
-If you're on Windows with Python 3.8, unzip the wheelhouse archive to a ``wheelhouse``
+If you're on Windows with Python 3.9, unzip the wheelhouse archive to a ``wheelhouse``
 directory and install PyDYNA using the preceding command.
 
-Run PyDYNA Server locally 
+Run PyDYNA server locally 
 -------------------------
 Launching the servers directly on local machines.
 

docker/pre/Dockerfile

@@ -1,6 +1,6 @@
 # Pydyna-pre service Linux-based Dockerfile
 
-FROM python:3.8-slim-buster
+FROM python:3.9-slim-buster
 
 # Define the working directory
 WORKDIR /server

pyproject.toml

@@ -7,10 +7,10 @@ name = "ansys-dyna-core"
 version = "0.4.dev0"
 description = "Python interface to LS-DYNA Service"
 readme = "README.rst"
-requires-python = ">=3.8,<4"
-license = {file = "LICENSE"}
-authors = [{name = "ANSYS, Inc.", email = "[email protected]"}]
-maintainers = [{name = "ANSYS, Inc.", email = "[email protected]"}]
+requires-python = ">=3.9,<4"
+license = { file = "LICENSE" }
+authors = [{ name = "ANSYS, Inc.", email = "[email protected]" }]
+maintainers = [{ name = "ANSYS, Inc.", email = "[email protected]" }]
 keywords = ["Ansys", "LS-DYNA", "gRPC"]
 classifiers = [
     "Development Status :: 4 - Beta",
@@ -19,37 +19,34 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
 ]
 
-dependencies = [
-    "ansys-dpf-core>=0.7.2",
-    "ansys-api-dyna==0.3.5",
-]
+dependencies = ["ansys-dpf-core>=0.7.2", "ansys-api-dyna==0.3.5"]
 
 [project.optional-dependencies]
 tests = [
-    "pyvista==0.43.0",
+    "pyvista==0.43.1",
     "matplotlib==3.8.2",
-    "numpy==1.26.2",
-    "pytest==7.4.3",
+    "numpy==1.26.3",
+    "pytest==7.4.4",
     "pytest-cov==4.1.0",
     "joblib==1.3.2",
     "pandas==2.1.4",
     "openpyxl==3.1.2",
     "scikit-learn==1.3.2",
     "pytest-xdist==3.5.0",
-    "ipython==8.18.1",
+    "ipython==8.20.0",
 ]
 doc = [
     "recommonmark==0.7.1",
     "matplotlib==3.8.2",
     "imageio==2.33.1",
     "imageio-ffmpeg==0.4.9",
-    "pyvista==0.43.0",
+    "pyvista==0.43.1",
     "numpydoc==1.6.0",
     "Sphinx==7.2.6",
     "sphinx-autobuild==2021.3.14",
@@ -59,14 +56,14 @@ doc = [
     "sphinx-copybutton==0.5.2",
     "sphinx-gallery==0.15.0",
     "sphinx-autodoc-typehints==1.25.2",
-    "ansys-sphinx-theme==0.12.5",
+    "ansys-sphinx-theme==0.13.0",
     "pypandoc==1.12",
     "nbsphinx==0.9.3",
     "ipywidgets==8.1.1",
     "joblib==1.3.2",
     "scikit-learn==1.3.2",
-    "ipython==8.18.1",
-    "jupyterlab==4.0.9",
+    "ipython==8.20.0",
+    "jupyterlab==4.0.10",
     "sphinx-jinja==2.0.2",
     "sphinx-autoapi==3.0.0",
 ]
@@ -99,6 +96,4 @@ show_missing = true
 [tool.pytest.ini_options]
 minversion = "7.1"
 addopts = "-ra --cov=ansys.dyna.core --cov-report html:.cov/html --cov-report xml:.cov/xml --cov-report term -vv"
-testpaths = [
-    "tests",
-]
+testpaths = ["tests"]

src/ansys/dyna/core/pre/dynalogging.py

@@ -241,11 +241,7 @@ def __init__(
         validate=True,
         defaults=None,
     ):
-        if sys.version_info[1] < 8:
-            super().__init__(fmt, datefmt, style)
-        else:
-            # 3.8: The validate parameter was added
-            super().__init__(fmt, datefmt, style, validate)
+        super().__init__(fmt, datefmt, style, validate)
         self._style = PymapdlPercentStyle(fmt, defaults=defaults)  # overwriting
 
 

tox.ini

@@ -9,10 +9,10 @@ isolated_build_env = build
 [testenv]
 description = Checks for project testing with desired extras
 basepython =
-    tests38: python3.8
     tests39: python3.9
     test310: python3.10
     test311: python3.11
+    test312: python3.12
     {style,tests,doc}: python3
 passenv = *
 setenv =