Skip to content
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.

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

FIX: Licensingclient path update for version 252 #5854

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
2dae089
licensingclient directory update
ramin4667 Feb 27, 2025
fd81f73
Condition added for 252 version folder update
ramin4667 Feb 27, 2025
068930d
Comment is applied.
ramin4667 Feb 28, 2025
82cc51f
Merge branch 'main' into FIX__Licensing_client_path_update_for_versio…
ramin4667 Feb 28, 2025
d779490
Merge branch 'FIX__Licensing_client_path_update_for_version_252_' int…
ramin4667 Feb 28, 2025
45dd506
Comments are applied.
ramin4667 Mar 1, 2025
8cc9802
Comments are applied.
ramin4667 Mar 1, 2025
78ab8d0
Merge branch 'FIX__Licensing_client_path_update_for_version_252_' of …
ramin4667 Mar 1, 2025
154a583
Merge remote-tracking branch 'origin/main' into FIX__Licensing_client…
ramin4667 Mar 2, 2025
853c3ca
Merge remote-tracking branch 'origin/main' into licensingclient_path
ramin4667 Mar 2, 2025
0012310
Licensingclient version check condition is removed.
ramin4667 Mar 2, 2025
90bdb82
Merge branch 'FIX__Licensing_client_path_update_for_version_252_' int…
ramin4667 Mar 2, 2025
b7e6290
Modified for testing purpose.
ramin4667 Mar 3, 2025
6130585
License environment condition update.
ramin4667 Mar 3, 2025
f6b8167
Modified for the latest version call.
ramin4667 Mar 3, 2025
a9202c8
Merge branch 'main' into FIX__Licensing_client_path_update_for_versio…
ramin4667 Mar 6, 2025
ec6063e
Merge branch 'main' into FIX__Licensing_client_path_update_for_versio…
SMoraisAnsys Mar 7, 2025
067ed1d
chore: adding changelog file 5854.fixed.md [dependabot-skip]
pyansys-ci-bot Mar 7, 2025
ab71e2b
Merge branch 'main' into FIX__Licensing_client_path_update_for_versio…
ramin4667 Mar 7, 2025
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
1 change: 1 addition & 0 deletions doc/changelog.d/5854.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Licensingclient path update for version 252
8 changes: 7 additions & 1 deletion src/ansys/aedt/core/generic/file_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -948,11 +948,17 @@ def available_license_feature(
port = name_env[0]
name = name_env[1]

if not input_dir:
if not input_dir and aedt_versions.latest_version:
Copy link
Contributor

Choose a reason for hiding this comment

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

@maxcapodi78 This logic is different than what you proposed. This appears to work for our use case, but is it ok to prefer the latest_version over current_version as we do here?

Copy link
Contributor

Choose a reason for hiding this comment

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

I think it's best to favor the latest_version for licensing so this makes sense to me. The tests pass and this fixed the issue we were seeing locally for 25.2.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Could you update the function by adding an extra parameter instead ? For example use_latest=False.
This would help people working with early dev versions to avoid using that release by default.

input_dir = Path(aedt_versions.installed_versions[aedt_versions.latest_version])
elif not input_dir:
input_dir = Path(aedt_versions.installed_versions[aedt_versions.current_version])
else:
input_dir = Path(input_dir)

# The licensing client location has changed in the Windows 25R2 AEDT installation.
if not check_if_path_exists(os.path.join(input_dir, "licensingclient")):
input_dir = Path(os.path.dirname(input_dir))
Copy link
Collaborator

Choose a reason for hiding this comment

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

I'm not sure to understand how this behave with the following code defining ansysli_util_path. Can you example why, if the path does not exist, it is still used afterward ?


if is_linux:
ansysli_util_path = input_dir / "licensingclient" / "linx64" / "lmutil"
else:
Expand Down
Loading