Skip to content

Rename external version #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 6, 2023
Merged

Rename external version #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
694030a
Rename external version
FedericoNegri May 31, 2023
42fb77b
Merge branch 'main' into fnegri/ansys_app_version
FedericoNegri Jun 2, 2023
bf63539
Bump dev version
FedericoNegri Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansys/rep/client/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
# ----------------------------------------------------------

from .__version__ import (
__ansys_apps_version__,
__company__,
__company_short__,
__external_version__,
__url__,
__version__,
__version_no_dots__,
Expand Down
11 changes: 7 additions & 4 deletions ansys/rep/client/__version__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(".", "")
Copy link
Contributor Author

@FedericoNegri FedericoNegri Jun 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the relevant change

__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"
6 changes: 3 additions & 3 deletions doc/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__)))

Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions examples/cfx_static_mixer/project_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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.
"""
Expand Down Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions examples/fluent_2d_heat_exchanger/project_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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()

Expand Down
6 changes: 3 additions & 3 deletions examples/fluent_nozzle/project_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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.
"""
Expand Down Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions examples/mapdl_linked_analyses/project_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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()

Expand Down
6 changes: 3 additions & 3 deletions examples/mapdl_motorbike_frame/project_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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.
Expand Down Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions examples/mapdl_tyre_performance/project_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion tests/test_examples.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion update_ansys_version_number.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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+)"]
Expand Down