Skip to content

Commit 39df8bf

Browse files
committed
FIX: Clean
1 parent e53a486 commit 39df8bf

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

environment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ dependencies:
4646
- pyarrow
4747
- pybv
4848
- pymatreader
49-
- PySide6 ==6.10.2
49+
- PySide6 !=6.7.0,!=6.8.0,!=6.8.0.1,!=6.9.1
5050
- python-neo
5151
- python-picard >=0.4
5252
- pyvista >=0.43
@@ -64,7 +64,7 @@ dependencies:
6464
- trame
6565
- trame-vtk
6666
- trame-vuetify
67-
- vtk ==9.6.1
67+
- vtk >=9.2
6868
- xlrd
6969
- pip:
7070
- pymef

tools/hooks/update_environment_file.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,21 @@ def split_dep(dep):
5050
# split package name from version spec
5151
translations = dict(neo="python-neo")
5252
conda_deps = set()
53+
version_spec_overrides = {
54+
# Help the solver work faster by specifying these (should be updated periodically):
55+
"PySide6": "==6.10.2",
56+
"vtk": "==9.6.1",
57+
}
58+
for key in version_spec_overrides:
59+
assert any(dep.startswith(key) for dep in deps), (
60+
f"Need to adjust code below if {key} is not a dependency: {deps}"
61+
)
5362
for dep in deps:
5463
package_name, version_spec = split_dep(dep)
64+
version_spec = version_spec_overrides.get(dep, version_spec)
5565
# handle package name differences
5666
package_name = translations.get(package_name, package_name)
57-
# PySide6==6.7.0 only exists on PyPI, not conda-forge, so excluding it in
58-
# `environment.yaml` breaks the solver. 6.9.1 has a bug, and 6.9.2 needs newer
5967
# C deps that mean we need to upgrade VTK etc.
60-
if package_name == "PySide6":
61-
version_spec = "==6.10.2"
62-
if package_name == "vtk":
63-
version_spec = "==9.6.1"
6468
# rstrip output line in case `version_spec` == ""
6569
line = f" - {package_name} {version_spec}".rstrip()
6670
# use pip for packages needing e.g. `platform_system` or `python_version` triaging

0 commit comments

Comments
 (0)