diff --git a/ansys/rep/client/__init__.py b/ansys/rep/client/__init__.py index e3240e648..c7d881aa0 100644 --- a/ansys/rep/client/__init__.py +++ b/ansys/rep/client/__init__.py @@ -7,9 +7,9 @@ # ---------------------------------------------------------- from .__version__ import ( + __ansys_apps_version__, __company__, __company_short__, - __external_version__, __url__, __version__, __version_no_dots__, diff --git a/ansys/rep/client/__version__.py b/ansys/rep/client/__version__.py index b9c7f7b58..400e4e8a9 100644 --- a/ansys/rep/client/__version__.py +++ b/ansys/rep/client/__version__.py @@ -1,6 +1,9 @@ -__version__ = "0.2.dev0" -__external_version__ = "2023 R2" -__version_no_dots__ = "232" +__version__ = "0.3.dev0" +__version_no_dots__ = __version__.replace(".", "") __company__ = "ANSYS, Inc." __company_short__ = "Ansys" -__url__ = "https://github.com/pyansys/pyrep" +__url__ = "https://github.com/ansys-internal/pyrep" + +# this is only a convenience to default the version +# of Ansys simulation applications in pyrep examples +__ansys_apps_version__ = "2023 R2" diff --git a/doc/source/conf.py b/doc/source/conf.py index f4d43b3e2..cde496888 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -6,7 +6,7 @@ from ansys_sphinx_theme import get_version_match from ansys_sphinx_theme import pyansys_logo_black as logo -from ansys.rep.client import __company__, __external_version__, __version__, __version_no_dots__ +from ansys.rep.client import __ansys_apps_version__, __company__, __version__, __version_no_dots__ sys.path.append(os.path.abspath(os.path.dirname(__file__))) @@ -251,8 +251,8 @@ global_substitutions = { "client_version": __version__, "version_no_dots": __version_no_dots__, - "external_version": __external_version__, - "ansys_version": __external_version__, + "external_version": __ansys_apps_version__, + "ansys_version": __ansys_apps_version__, } # numpydoc configuration diff --git a/examples/cfx_static_mixer/project_setup.py b/examples/cfx_static_mixer/project_setup.py index f730beb83..1255272b9 100644 --- a/examples/cfx_static_mixer/project_setup.py +++ b/examples/cfx_static_mixer/project_setup.py @@ -5,7 +5,7 @@ import logging import os -from ansys.rep.client import Client, REPError, __external_version__ +from ansys.rep.client import Client, REPError, __ansys_apps_version__ from ansys.rep.client.jms import ( File, JmsApi, @@ -23,7 +23,7 @@ log = logging.getLogger(__name__) -def create_project(client, name, num_jobs=20, version=__external_version__): +def create_project(client, name, num_jobs=20, version=__ansys_apps_version__): """ Create a REP project consisting of an ANSYS CFX model. """ @@ -155,7 +155,7 @@ def create_project(client, name, num_jobs=20, version=__external_version__): parser.add_argument("-U", "--url", default="https://127.0.0.1:8443/rep") parser.add_argument("-u", "--username", default="repadmin") parser.add_argument("-p", "--password", default="repadmin") - parser.add_argument("-v", "--ansys-version", default=__external_version__) + parser.add_argument("-v", "--ansys-version", default=__ansys_apps_version__) args = parser.parse_args() logger = logging.getLogger() diff --git a/examples/fluent_2d_heat_exchanger/project_setup.py b/examples/fluent_2d_heat_exchanger/project_setup.py index 1dd08ab28..5ed7dbbe3 100644 --- a/examples/fluent_2d_heat_exchanger/project_setup.py +++ b/examples/fluent_2d_heat_exchanger/project_setup.py @@ -6,7 +6,7 @@ import logging import os -from ansys.rep.client import Client, REPError, __external_version__ +from ansys.rep.client import Client, REPError, __ansys_apps_version__ from ansys.rep.client.jms import ( File, JmsApi, @@ -114,7 +114,7 @@ def main(client: Client, name: str, version: str) -> Project: parser.add_argument("-U", "--url", default="https://localhost:8443/rep") parser.add_argument("-u", "--username", default="repadmin") parser.add_argument("-p", "--password", default="repadmin") - parser.add_argument("-v", "--ansys-version", default=__external_version__) + parser.add_argument("-v", "--ansys-version", default=__ansys_apps_version__) args = parser.parse_args() diff --git a/examples/fluent_nozzle/project_setup.py b/examples/fluent_nozzle/project_setup.py index f36ddc10e..a0d21d493 100644 --- a/examples/fluent_nozzle/project_setup.py +++ b/examples/fluent_nozzle/project_setup.py @@ -5,7 +5,7 @@ import logging import os -from ansys.rep.client import Client, REPError, __external_version__ +from ansys.rep.client import Client, REPError, __ansys_apps_version__ from ansys.rep.client.jms import ( File, JmsApi, @@ -23,7 +23,7 @@ log = logging.getLogger(__name__) -def create_project(client, name, num_jobs=20, version=__external_version__): +def create_project(client, name, num_jobs=20, version=__ansys_apps_version__): """ Create a REP project consisting of an Ansys Fluent model. """ @@ -187,7 +187,7 @@ def create_project(client, name, num_jobs=20, version=__external_version__): parser.add_argument("-U", "--url", default="https://127.0.0.1:8443/rep") parser.add_argument("-u", "--username", default="repadmin") parser.add_argument("-p", "--password", default="repadmin") - parser.add_argument("-v", "--ansys-version", default=__external_version__) + parser.add_argument("-v", "--ansys-version", default=__ansys_apps_version__) args = parser.parse_args() logger = logging.getLogger() diff --git a/examples/mapdl_linked_analyses/project_setup.py b/examples/mapdl_linked_analyses/project_setup.py index 710cee3c5..275f7a1b1 100644 --- a/examples/mapdl_linked_analyses/project_setup.py +++ b/examples/mapdl_linked_analyses/project_setup.py @@ -24,7 +24,7 @@ import os from typing import List, Tuple -from ansys.rep.client import Client, REPError, __external_version__ +from ansys.rep.client import Client, REPError, __ansys_apps_version__ from ansys.rep.client.jms import ( File, JmsApi, @@ -321,7 +321,7 @@ def create_project(client: Client, name: str, incremental: bool, version: str) - parser.add_argument("-u", "--username", default="repadmin") parser.add_argument("-p", "--password", default="repadmin") parser.add_argument("--incremental", action="store_true") - parser.add_argument("-v", "--ansys-version", default=__external_version__) + parser.add_argument("-v", "--ansys-version", default=__ansys_apps_version__) args = parser.parse_args() diff --git a/examples/mapdl_motorbike_frame/project_setup.py b/examples/mapdl_motorbike_frame/project_setup.py index 2f6c70bd4..ca5ea2d45 100644 --- a/examples/mapdl_motorbike_frame/project_setup.py +++ b/examples/mapdl_motorbike_frame/project_setup.py @@ -9,7 +9,7 @@ import os import random -from ansys.rep.client import Client, REPError, __external_version__ +from ansys.rep.client import Client, REPError, __ansys_apps_version__ from ansys.rep.client.jms import ( File, FitnessDefinition, @@ -32,7 +32,7 @@ def create_project( - client, name, version=__external_version__, num_jobs=20, use_exec_script=False, active=True + client, name, version=__ansys_apps_version__, num_jobs=20, use_exec_script=False, active=True ) -> Project: """ Create a REP project consisting of an ANSYS APDL beam model of a motorbike-frame. @@ -333,7 +333,7 @@ def create_project( parser.add_argument("-U", "--url", default="https://127.0.0.1:8443/rep") parser.add_argument("-u", "--username", default="repadmin") parser.add_argument("-p", "--password", default="repadmin") - parser.add_argument("-v", "--ansys-version", default=__external_version__) + parser.add_argument("-v", "--ansys-version", default=__ansys_apps_version__) args = parser.parse_args() logger = logging.getLogger() diff --git a/examples/mapdl_tyre_performance/project_setup.py b/examples/mapdl_tyre_performance/project_setup.py index 01e89cb61..ac128df16 100644 --- a/examples/mapdl_tyre_performance/project_setup.py +++ b/examples/mapdl_tyre_performance/project_setup.py @@ -10,7 +10,7 @@ import os import random -from ansys.rep.client import Client, REPError, __external_version__ +from ansys.rep.client import Client, REPError, __ansys_apps_version__ from ansys.rep.client.jms import ( File, FloatParameterDefinition, @@ -229,7 +229,7 @@ def main(client: Client, name: str, num_jobs: int, version: str) -> Project: parser.add_argument("-U", "--url", default="https://localhost:8443/rep") parser.add_argument("-u", "--username", default="repadmin") parser.add_argument("-p", "--password", default="repadmin") - parser.add_argument("-v", "--ansys-version", default=__external_version__) + parser.add_argument("-v", "--ansys-version", default=__ansys_apps_version__) args = parser.parse_args() diff --git a/tests/test_examples.py b/tests/test_examples.py index 2c6a225db..7a6ca156a 100644 --- a/tests/test_examples.py +++ b/tests/test_examples.py @@ -1,7 +1,7 @@ import logging import unittest -from ansys.rep.client import __external_version__ as ansys_version +from ansys.rep.client import __ansys_apps_version__ as ansys_version from ansys.rep.client.jms import JmsApi, ProjectApi from tests.rep_test import REPTestCase diff --git a/update_ansys_version_number.py b/update_ansys_version_number.py index 3001e1109..7da813dc0 100644 --- a/update_ansys_version_number.py +++ b/update_ansys_version_number.py @@ -45,7 +45,7 @@ def main(): replace_regex(version_file_path, internal_version_no_dot, [r'__version_no_dots__ = "(\d+)"']) - replace_regex(version_file_path, external_version, [r'__external_version__ = "(.*)"']) + replace_regex(version_file_path, external_version, [r'__ansys_apps_version__ = "(.*)"']) replace_regex( os.path.join(cwd, "doc", "source", "conf.py"), internal_version_no_dot, [r"corp/v(\d+)"]