Upgrade nova-trame to use proper nova-mvvm (d80fb10a) · Commits · Pugmire, Dave / CT Scan Visualizer

poetry.lock

+22 −22

Original line number	Diff line number	Diff line
		@@ -1420,24 +1420,6 @@ files = [
		[package.dependencies]
		typing-extensions = {version = ">=4.1.0", markers = "python_version < \"3.11\""}

		[[package]]
		name = "mvvm-lib"
		version = "0.4.2"
		description = "A Python Package for Model-View-ViewModel pattern"
		optional = false
		python-versions = "<4.0,>=3.10"
		files = [
		{file = "mvvm_lib-0.4.2-py3-none-any.whl", hash = "sha256:278d194517be7e8dc9ffbafabdf7e318c0e4bef019aeebd9ea06ec527354ca8b"},
		]

		[package.dependencies]
		trame = ">=3.6.3,<4.0.0"

		[package.extras]
		panel = ["panel (>=1.4.4,<2.0.0)"]
		pyqt5 = ["pyqt5 (>=5.15.11,<6.0.0)"]
		pyqt6 = ["pyqt6 (>=6.7.0,<7.0.0)"]

		[[package]]
		name = "mypy"
		version = "1.13.0"
		@@ -1528,20 +1510,38 @@ files = [
		{file = "nodeenv-1.9.1.tar.gz", hash = "sha256:6ec12890a2dab7946721edbfbcd91f3319c6ccc9aec47be7c7e6b7011ee6645f"},
		]

		[[package]]
		name = "nova-mvvm"
		version = "0.6.1"
		description = "A Python Package for Model-View-ViewModel pattern"
		optional = false
		python-versions = "<4.0,>=3.10"
		files = [
		{file = "nova_mvvm-0.6.1-py3-none-any.whl", hash = "sha256:b38719843519c5bce9cbaac2fee3aeac32ae81ee2d123254e8fd9374f98ff27a"},
		]

		[package.dependencies]
		trame = ">=3.6.3,<4.0.0"

		[package.extras]
		panel = ["panel (>=1.4.4,<2.0.0)"]
		pyqt5 = ["pyqt5 (>=5.15.11,<6.0.0)"]
		pyqt6 = ["pyqt6 (>=6.7.0,<7.0.0)"]

		[[package]]
		name = "nova-trame"
		version = "0.8.0"
		version = "0.10.1"
		description = "A Python Package for injecting curated themes and custom components into Trame applications"
		optional = false
		python-versions = "<4.0,>=3.10"
		files = [
		{file = "nova_trame-0.8.0-py3-none-any.whl", hash = "sha256:1887aab4407154aea780d0051bd5fdea22407aeb891fa0e0df2a316e9a6070e2"},
		{file = "nova_trame-0.10.1-py3-none-any.whl", hash = "sha256:fa48b2d50c5822bb23c7a32b717ca7f569f2e9cc44033a0d850fca6b80d11623"},
		]

		[package.dependencies]
		libsass = ">=0.23.0,<0.24.0"
		mergedeep = ">=1.3.4,<2.0.0"
		mvvm-lib = ">=0.4.0"
		nova-mvvm = ">=0.6.1,<0.7.0"
		pydantic = ">=2.10.1,<3.0.0"
		tomli = ">=2.0.2,<3.0.0"
		trame = ">=3.6.3,<4.0.0"
		@@ -2950,4 +2950,4 @@ propcache = ">=0.2.0"
		[metadata]
		lock-version = "2.0"
		python-versions = "^3.10"
		content-hash = "be42e1efa6f26a341f83fc981aacc64263998e1281b76c010e3dfd15ff925e78"
		content-hash = "ebfece4e3fff60f7f9113904757c079b59eb888cbd316997f3fa6a6fea215ac0"

pyproject.toml

+2 −3

Original line number	Diff line number	Diff line
		[tool.poetry]
		name = "ctscan-viz"
		version = "0.3.3"
		version = "0.3.4"
		description = "Trame application for volume rendering CT scans stored in TIFF stacks"
		authors = []
		readme = "README.md"
		@@ -10,9 +10,8 @@ packages = [{include = "ctscan_viz", from = "src"}]

		[tool.poetry.dependencies]
		python = "^3.10"
		mvvm_lib = "^0.4.2"
		natsort = "^8.4.0"
		nova-trame = "^0.8.0"
		nova-trame = "^0.10.1"
		pydantic = "^2.10.3"
		trame-vtk = "^2.8.11"
		vtk = "^9.4.0"

src/ctscan_viz/views/control_panel.py

+0 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ class ControlPanel:
		allow_folders=True,
		base_paths=["/HFIR", "/SNS"],
		input_props={"classes": "mb-2"},
		label="Select Data Directory", # TODO: remove this after nova-trame bug is fixed
		)

		with GridLayout(classes="mb-2", columns=4, valign="center"):