Skip to content

Commit a4b0437

Browse files
authored
Update USD Core to 25.8, and python requirements to >=3.10 and < 3.14. (#571)
1 parent c240425 commit a4b0437

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

doc/source/calc_functions.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2388,11 +2388,10 @@ the *Sandia Verdict Library*.
23882388

23892389
**References**
23902390

2391-
For more information on individual metrics, see these references:
2391+
For more information on individual metrics, see this reference:
23922392

23932393
1. C. J. Stimpson, C. D. Ernst, P. Knupp, P. P. Pebay, & D.
23942394
Thompson, The Verdict Library Reference Manual, May 8, 2007.
2395-
2. The Verdict Library Reference Manual (https://public.kitware.com/Wiki/images/6/6b/VerdictManual-revA.pdf)
23962395

23972396

23982397

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies = [
3535
"Pillow>=9.3.0",
3636
"pypng>=0.0.20",
3737
"psutil>=5.9.2",
38-
"usd-core==24.8; python_version < '3.13' and platform_machine != 'aarch64'",
38+
"usd-core==25.8; platform_machine != 'aarch64'",
3939
"pygltflib>=1.16.2",
4040
"grpcio<1.68.0",
4141
]
@@ -73,7 +73,7 @@ doc = [
7373
"sphinxcontrib-openapi==0.8.4",
7474
"coverage-badge==1.1.2",
7575
"sphinxcontrib-video==0.2.1",
76-
"usd-core>=24.8",
76+
"usd-core>=25.8",
7777
"pygltflib>=1.16.2",
7878
]
7979

src/ansys/pyensight/core/utils/omniverse_dsg_server.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
try:
4141
from pxr import Gf, Sdf, Usd, UsdGeom, UsdLux, UsdShade
4242
except ModuleNotFoundError:
43-
if sys.version_info.minor >= 13:
44-
warnings.warn("USD Export not supported for Python >= 3.13")
43+
if sys.version_info.minor >= 14:
44+
warnings.warn("USD Export not supported for Python >= 3.14")
4545
sys.exit(1)
4646
is_linux_arm64 = platform.system() == "Linux" and platform.machine() == "aarch64"
4747
if is_linux_arm64:

tests/example_tests/test_glb_usd.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
def test_glb_usd():
1212
# Get the example files
13-
if sys.version_info.minor >= 13:
14-
warnings.warn("Test not supported for Python >= 3.13")
13+
if sys.version_info.minor >= 14:
14+
warnings.warn("Test not supported for Python >= 3.14")
1515
return
1616
base_uri = "https://s3.amazonaws.com/www3.ensight.com/PyEnSight/ExampleData"
1717
filenames = ["fluent_elbow.glb", "rwing_bsl_1.glb", "rwing_bsl_2.glb", "ens_car_exts.glb"]
@@ -38,8 +38,8 @@ def test_glb_usd():
3838

3939

4040
def test_ensight_glb_usd():
41-
if sys.version_info.minor >= 13:
42-
warnings.warn("Test not supported for Python >= 3.13")
41+
if sys.version_info.minor >= 14:
42+
warnings.warn("Test not supported for Python >= 3.14")
4343
return
4444
# Get the example files: both generated by Ensight, _10.glb is time varying.
4545
base_uri = "https://s3.amazonaws.com/www3.ensight.com/PyEnSight/ExampleData"

tests/example_tests/test_usd_export.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ def wait_for_idle(session):
4848

4949

5050
def test_usd_export(tmpdir, pytestconfig: pytest.Config):
51-
if sys.version_info.minor >= 13:
52-
warnings.warn("Test not supported for Python >= 3.13")
51+
if sys.version_info.minor >= 14:
52+
warnings.warn("Test not supported for Python >= 3.14")
5353
return
5454
data_dir = tmpdir.mkdir("datadir")
5555
use_local = pytestconfig.getoption("use_local_launcher")

0 commit comments

Comments
 (0)