-
Notifications
You must be signed in to change notification settings - Fork 141
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
ramin4667
wants to merge
19
commits into
main
Choose a base branch
from
FIX__Licensing_client_path_update_for_version_252_
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 16 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
2dae089
licensingclient directory update
ramin4667 fd81f73
Condition added for 252 version folder update
ramin4667 068930d
Comment is applied.
ramin4667 82cc51f
Merge branch 'main' into FIX__Licensing_client_path_update_for_versio…
ramin4667 d779490
Merge branch 'FIX__Licensing_client_path_update_for_version_252_' int…
ramin4667 45dd506
Comments are applied.
ramin4667 8cc9802
Comments are applied.
ramin4667 78ab8d0
Merge branch 'FIX__Licensing_client_path_update_for_version_252_' of …
ramin4667 154a583
Merge remote-tracking branch 'origin/main' into FIX__Licensing_client…
ramin4667 853c3ca
Merge remote-tracking branch 'origin/main' into licensingclient_path
ramin4667 0012310
Licensingclient version check condition is removed.
ramin4667 90bdb82
Merge branch 'FIX__Licensing_client_path_update_for_version_252_' int…
ramin4667 b7e6290
Modified for testing purpose.
ramin4667 6130585
License environment condition update.
ramin4667 f6b8167
Modified for the latest version call.
ramin4667 a9202c8
Merge branch 'main' into FIX__Licensing_client_path_update_for_versio…
ramin4667 ec6063e
Merge branch 'main' into FIX__Licensing_client_path_update_for_versio…
SMoraisAnsys 067ed1d
chore: adding changelog file 5854.fixed.md [dependabot-skip]
pyansys-ci-bot ab71e2b
Merge branch 'main' into FIX__Licensing_client_path_update_for_versio…
ramin4667 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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: | ||
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)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 |
||
|
||
if is_linux: | ||
ansysli_util_path = input_dir / "licensingclient" / "linx64" / "lmutil" | ||
else: | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.