Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/6748.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
F-string usage for IronPython compatibility
6 changes: 2 additions & 4 deletions doc/source/Resources/pyaedt_installer_from_aedt.py
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,6 @@ def install_pyaedt():
subprocess.run(command, check=True, env=env) # nosec
else:
# Try to install uv and use it, fallback to pip if it fails
uv_available = True
try:
print("Installing uv in the virtual environment...")
subprocess.run([str(pip_exe), "--default-timeout=1000", "install", "uv"], check=True, env=env) # nosec
Expand All @@ -375,9 +374,8 @@ def install_pyaedt():
else:
subprocess.run([str(uv_exe), "pip", "install", "pyaedt[all]"], check=True, env=env) # nosec
except subprocess.CalledProcessError as e:
print(f"uv installation failed with error: {e}")
print("uv installation failed with error: {}".format(e))
print("Falling back to pip for package installation...")
uv_available = False
subprocess.run([str(pip_exe), "--default-timeout=1000", "install", "--upgrade", "pip"], check=True, env=env) # nosec
subprocess.run([str(pip_exe), "--default-timeout=1000", "install", "wheel"], check=True, env=env) # nosec
if args.version <= "231":
Expand Down Expand Up @@ -442,7 +440,7 @@ def install_pyaedt():
else:
subprocess.run([str(uv_exe), "pip", "install", "pyaedt[all]"], check=True, env=env) # nosec
except subprocess.CalledProcessError as e:
print(f"uv installation failed with error: {e}")
print("uv installation failed with error: {}".format(e))
print("Falling back to pip for package installation...")
subprocess.run([str(pip_exe), "--default-timeout=1000", "uninstall", "pyaedt", "-y"], check=True, env=env) # nosec
if args.version <= "231":
Expand Down