Reorganize the library layout (#94)

TimMonko · web-flow · commit 9c26f6db3d2d · 2026-02-28T11:44:13.000-06:00
# Description

This moves qt/widget code into widgets/
It also renames many files to better capture what they contain.
diff --git a/src/napari_metadata/file_size.py b/src/napari_metadata/file_size.py
diff --git a/src/napari_metadata/layer_utils.py b/src/napari_metadata/layer_utils.py
diff --git a/src/napari_metadata/napari.yaml b/src/napari_metadata/napari.yaml
@@ -3,7 +3,7 @@ display_name: Layer metadata
 contributions:
   commands:
     - id: napari-metadata.make_metadata_qwidget
-      python_name: napari_metadata._widget:MetadataWidget
+      python_name: napari_metadata.widgets:MetadataWidget
       title: Make metadata widget
   widgets:
     - command: napari-metadata.make_metadata_qwidget
diff --git a/src/napari_metadata/units.py b/src/napari_metadata/units.py
diff --git a/src/napari_metadata/widgets/__init__.py b/src/napari_metadata/widgets/__init__.py
@@ -0,0 +1,8 @@
+"""Widget subpackage for napari-metadata.
+
+All Qt-dependent code lives here.
+"""
+
+from napari_metadata.widgets._main import MetadataWidget
+
+__all__ = ['MetadataWidget']
diff --git a/src/napari_metadata/widgets/_axis.py b/src/napari_metadata/widgets/_axis.py
@@ -19,8 +19,7 @@
     QWidget,
 )
 
-from napari_metadata._axis_units import AxisUnitEnum
-from napari_metadata._model import (
+from napari_metadata.layer_utils import (
     get_axes_labels,
     get_axes_scales,
     get_axes_translations,
@@ -32,7 +31,8 @@
     set_axes_translations,
     set_axes_units,
 )
-from napari_metadata._protocols import (
+from napari_metadata.units import AxisUnitEnum
+from napari_metadata.widgets._protocols import (
     AxesMetadataComponentsInstanceAPI,
     AxisComponent,
     MetadataWidgetAPI,
diff --git a/src/napari_metadata/widgets/_containers.py b/src/napari_metadata/widgets/_containers.py
@@ -16,7 +16,7 @@
     QWidget,
 )
 
-from napari_metadata._protocols import MetadataWidgetAPI
+from napari_metadata.widgets._protocols import MetadataWidgetAPI
 
 if TYPE_CHECKING:
     import napari.viewer
diff --git a/src/napari_metadata/widgets/_file.py b/src/napari_metadata/widgets/_file.py
@@ -4,14 +4,14 @@
 from qtpy.QtGui import QFontMetrics
 from qtpy.QtWidgets import QLabel, QLineEdit, QSizePolicy, QTextEdit, QWidget
 
-from napari_metadata._file_size import generate_display_size
-from napari_metadata._model import (
+from napari_metadata.file_size import generate_display_size
+from napari_metadata.layer_utils import (
     get_layer_data_dtype,
     get_layer_data_shape,
     get_layer_source_path,
     resolve_layer,
 )
-from napari_metadata._protocols import MetadataComponent
+from napari_metadata.widgets._protocols import MetadataComponent
 
 if TYPE_CHECKING:
     from napari.layers import Layer
diff --git a/src/napari_metadata/widgets/_inheritance.py b/src/napari_metadata/widgets/_inheritance.py
@@ -10,7 +10,7 @@
     QWidget,
 )
 
-from napari_metadata._model import (
+from napari_metadata.layer_utils import (
     connect_callback_to_layer_name_changed,
     connect_callback_to_layer_selection_events,
     connect_callback_to_list_events,
@@ -20,7 +20,7 @@
     get_layers_list,
     resolve_layer,
 )
-from napari_metadata._protocols import MetadataWidgetAPI
+from napari_metadata.widgets._protocols import MetadataWidgetAPI
 
 if TYPE_CHECKING:
     from napari.components import ViewerModel
diff --git a/src/napari_metadata/widgets/_main.py b/src/napari_metadata/widgets/_main.py
@@ -22,27 +22,27 @@
     QWidget,
 )
 
-from napari_metadata._axis_metadata_widgets import (
+from napari_metadata.layer_utils import (
+    resolve_layer,
+    set_axes_labels,
+    set_axes_scales,
+    set_axes_translations,
+    set_axes_units,
+)
+from napari_metadata.units import AxisUnitEnum
+from napari_metadata.widgets._axis import (
     AxisLabels,
     AxisMetadata,
     AxisScales,
     AxisTranslations,
 )
-from napari_metadata._axis_units import AxisUnitEnum
-from napari_metadata._collapsible_containers import (
+from napari_metadata.widgets._containers import (
     CollapsibleSectionContainer,
     HorizontalOnlyOuterScrollArea,
 )
-from napari_metadata._file_metadata_widgets import FileGeneralMetadata
-from napari_metadata._inheritance_widget import InheritanceWidget
-from napari_metadata._model import (
-    resolve_layer,
-    set_axes_labels,
-    set_axes_scales,
-    set_axes_translations,
-    set_axes_units,
-)
-from napari_metadata._protocols import (
+from napari_metadata.widgets._file import FileGeneralMetadata
+from napari_metadata.widgets._inheritance import InheritanceWidget
+from napari_metadata.widgets._protocols import (
     AxesMetadataComponentsInstanceAPI,
     AxisComponent,
     MetadataComponent,
diff --git a/src/napari_metadata/widgets/_protocols.py b/src/napari_metadata/widgets/_protocols.py
diff --git a/tests/test_file_size.py b/tests/test_file_size.py
@@ -1,12 +1,12 @@
-"""Tests for napari_metadata._file_size."""
+"""Tests for napari_metadata.file_size."""
 
 import os
 from unittest.mock import MagicMock
 
 import napari.layers
 import numpy as np
 
-from napari_metadata._file_size import (
+from napari_metadata.file_size import (
     _generate_text_for_size,
     generate_display_size,
 )
diff --git a/tests/test_layer_utils.py b/tests/test_layer_utils.py
@@ -2,7 +2,7 @@
 import pytest
 from napari.components import ViewerModel
 
-from napari_metadata._model import (
+from napari_metadata.layer_utils import (
     connect_callback_to_layer_name_changed,
     connect_callback_to_layer_selection_events,
     connect_callback_to_list_events,
diff --git a/tests/test_napari.py b/tests/test_napari.py
@@ -1,4 +1,4 @@
-from napari_metadata._widget import MetadataWidget
+from napari_metadata.widgets import MetadataWidget
 
 
 def test_add_widget_to_napari(make_napari_viewer):
diff --git a/tests/test_units.py b/tests/test_units.py
@@ -3,7 +3,7 @@
 import pint
 import pytest
 
-from napari_metadata._axis_units import AxisUnitEnum, _UnitConfig
+from napari_metadata.units import AxisUnitEnum, _UnitConfig
 
 
 class TestUnitConfig:

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`QWidget,`
`17`	`17`	`)`
`18`	`18`
`19`		`-from napari_metadata._protocols import MetadataWidgetAPI`
	`19`	`+from napari_metadata.widgets._protocols import MetadataWidgetAPI`
`20`	`20`
`21`	`21`	`if TYPE_CHECKING:`
`22`	`22`	`import napari.viewer`