python/dom-toml: update to 2.2.0

components/python/dom-toml/.gitignore

@@ -1 +1 @@
-/dom_toml-2.1.0/
+/dom_toml-2.2.0/

components/python/dom-toml/Makefile

@@ -19,14 +19,13 @@ BUILD_STYLE = pyproject
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME =		dom_toml
-HUMAN_VERSION =			2.1.0
-COMPONENT_REVISION =		1
+HUMAN_VERSION =			2.2.0
 COMPONENT_SUMMARY =		Dom's tools for Tom's Obvious, Minimal Language.
 COMPONENT_PROJECT_URL =		https://github.com/domdfcoding/dom_toml
 COMPONENT_ARCHIVE_URL =		\
 	https://github.com/domdfcoding/dom_toml/archive/refs/tags/v$(HUMAN_VERSION).tar.gz
 COMPONENT_ARCHIVE_HASH =	\
-	sha256:80bd0dcc451c15b43aa6d6f0cccdea4cac2ecb9040211a6ac9943c3bca848fbe
+	sha256:30e7ea6beff628e7da9ebc01b4d6491a284a57943f4472868e391baf0a683c8c
 COMPONENT_LICENSE =		MIT
 COMPONENT_LICENSE_FILE =	LICENSE
 
@@ -48,9 +47,11 @@ REQUIRED_PACKAGES.python += library/python/domdf-python-tools
 REQUIRED_PACKAGES.python += library/python/flit-core
 REQUIRED_PACKAGES.python += library/python/tomli
 REQUIRED_PACKAGES.python += runtime/python
+TEST_REQUIRED_PACKAGES.python += library/python/attrs
 TEST_REQUIRED_PACKAGES.python += library/python/coincidence
 TEST_REQUIRED_PACKAGES.python += library/python/importlib-metadata
 TEST_REQUIRED_PACKAGES.python += library/python/numpy
 TEST_REQUIRED_PACKAGES.python += library/python/pytest
 TEST_REQUIRED_PACKAGES.python += library/python/pytest-randomly
 TEST_REQUIRED_PACKAGES.python += library/python/pytest-timeout
+TEST_REQUIRED_PACKAGES.python += library/python/tomli-w

components/python/dom-toml/dom_toml-PYVER.p5m

@@ -27,6 +27,8 @@ file path=usr/lib/python$(PYVER)/vendor-packages/dom_toml-$(HUMAN_VERSION).dist-
 file path=usr/lib/python$(PYVER)/vendor-packages/dom_toml-$(HUMAN_VERSION).dist-info/WHEEL
 file path=usr/lib/python$(PYVER)/vendor-packages/dom_toml-$(HUMAN_VERSION).dist-info/licenses/LICENSE
 file path=usr/lib/python$(PYVER)/vendor-packages/dom_toml/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dom_toml/config/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dom_toml/config/fields.py
 file path=usr/lib/python$(PYVER)/vendor-packages/dom_toml/decoder.py
 file path=usr/lib/python$(PYVER)/vendor-packages/dom_toml/encoder.py
 file path=usr/lib/python$(PYVER)/vendor-packages/dom_toml/parser.py

components/python/dom-toml/manifests/sample-manifest.p5m

@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2025 <contributor>
+# Copyright 2026 <contributor>
 #
 
 set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -27,6 +27,8 @@ file path=usr/lib/python$(PYVER)/vendor-packages/dom_toml-$(HUMAN_VERSION).dist-
 file path=usr/lib/python$(PYVER)/vendor-packages/dom_toml-$(HUMAN_VERSION).dist-info/WHEEL
 file path=usr/lib/python$(PYVER)/vendor-packages/dom_toml-$(HUMAN_VERSION).dist-info/licenses/LICENSE
 file path=usr/lib/python$(PYVER)/vendor-packages/dom_toml/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dom_toml/config/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dom_toml/config/fields.py
 file path=usr/lib/python$(PYVER)/vendor-packages/dom_toml/decoder.py
 file path=usr/lib/python$(PYVER)/vendor-packages/dom_toml/encoder.py
 file path=usr/lib/python$(PYVER)/vendor-packages/dom_toml/parser.py

components/python/dom-toml/patches/01-tox-requires.patch

@@ -1,8 +1,8 @@
 None of pip, tox-envlist, and virtualenv are needed to run tests.
 tox version pin is too strict.
 
---- dom_toml-2.1.0/tox.ini.orig
-+++ dom_toml-2.1.0/tox.ini
+--- dom_toml-2.2.0/tox.ini.orig
++++ dom_toml-2.2.0/tox.ini
 @@ -37,11 +37,6 @@
      build
  skip_missing_interpreters = True

components/python/dom-toml/patches/02-no-coverage.patch

@@ -1,7 +1,7 @@
 We do not need to check coverage for this project.
 
---- dom_toml-2.1.0/tests/requirements.txt.orig
-+++ dom_toml-2.1.0/tests/requirements.txt
+--- dom_toml-2.2.0/tests/requirements.txt.orig
++++ dom_toml-2.2.0/tests/requirements.txt
 @@ -1,9 +1,6 @@
  coincidence>=0.2.0
 -coverage>=5.1
@@ -12,10 +12,10 @@ We do not need to check coverage for this project.
 -pytest-cov>=2.8.1
  pytest-randomly>=3.7.0
  pytest-timeout>=1.4.2
---- dom_toml-2.1.0/tox.ini.orig
-+++ dom_toml-2.1.0/tox.ini
-@@ -51,7 +51,7 @@
- deps = -r{toxinidir}/tests/requirements.txt
+--- dom_toml-2.2.0/tox.ini.orig
++++ dom_toml-2.2.0/tox.ini
+@@ -52,7 +52,7 @@
+ extras = config
  commands =
      python --version
 -    python -m pytest --cov=dom_toml -r aR tests/ {posargs}

components/python/dom-toml/patches/03-no-version.patch

@@ -1,8 +1,8 @@
---- dom_toml-2.1.0/tox.ini.orig
-+++ dom_toml-2.1.0/tox.ini
-@@ -50,7 +50,6 @@
-     SETUPTOOLS_USE_DISTUTILS=stdlib
+--- dom_toml-2.2.0/tox.ini.orig
++++ dom_toml-2.2.0/tox.ini
+@@ -51,7 +51,6 @@
  deps = -r{toxinidir}/tests/requirements.txt
+ extras = config
  commands =
 -    python --version
      python -m pytest -r aR tests/ {posargs}

components/python/dom-toml/test/results-all.master

@@ -7,7 +7,7 @@ configfile: tox.ini
 timeout: 300.0s
 timeout method: signal
 timeout func_only: False
-collecting ... collected 331 items
+collecting ... collected 372 items
 
 tests/test_api.py::test_array_sep[instance] PASSED
 tests/test_api.py::test_array_sep[instance_tab] PASSED
@@ -25,6 +25,47 @@ tests/test_api.py::test_pathlib[instance] PASSED
 tests/test_api.py::test_pathlib[type] PASSED
 tests/test_api.py::test_paths PASSED
 tests/test_api.py::test_tuple PASSED
+tests/test_config.py::test_coerce_error PASSED
+tests/test_config.py::test_default_methods[AlignmentMethod] PASSED
+tests/test_config.py::test_default_methods[ConsolidateMethod] PASSED
+tests/test_config.py::test_default_methods[IntensityMatrixMethod] PASSED
+tests/test_config.py::test_default_methods[Method] PASSED
+tests/test_config.py::test_default_methods[PeakDetectionMethod] PASSED
+tests/test_config.py::test_default_methods[PeakFilterMethod] PASSED
+tests/test_config.py::test_default_methods[SavitzkyGolayMethod] PASSED
+tests/test_config.py::test_fields[FieldsMethodNew] PASSED
+tests/test_config.py::test_fields[FieldsMethod] PASSED
+tests/test_config.py::test_from_json PASSED
+tests/test_config.py::test_from_toml PASSED
+tests/test_config.py::test_partial_arguments[alignment_gap_penalty] PASSED
+tests/test_config.py::test_partial_arguments[alignment_min_peak_area] PASSED
+tests/test_config.py::test_partial_arguments[alignment_min_peaks] PASSED
+tests/test_config.py::test_partial_arguments[alignment_rt_modulation] PASSED
+tests/test_config.py::test_partial_arguments[alignment_top_n_peaks] PASSED
+tests/test_config.py::test_partial_arguments[im_mass_range] PASSED
+tests/test_config.py::test_partial_arguments[im_savgol_dict_false] PASSED
+tests/test_config.py::test_partial_arguments[im_savgol_dict_window] PASSED
+tests/test_config.py::test_partial_arguments[im_savgol_false] PASSED
+tests/test_config.py::test_partial_arguments[im_tophat_structure_size] PASSED
+tests/test_config.py::test_partial_arguments[peak_detection_points] PASSED
+tests/test_config.py::test_partial_arguments[peak_detection_scans] PASSED
+tests/test_config.py::test_partial_arguments[peak_filter_base_peak_filter_list] PASSED
+tests/test_config.py::test_partial_arguments[peak_filter_base_peak_filter_set] PASSED
+tests/test_config.py::test_partial_arguments[peak_filter_noise_filter] PASSED
+tests/test_config.py::test_partial_arguments[peak_filter_noise_threshold] PASSED
+tests/test_config.py::test_partial_arguments[savgol_degree] PASSED
+tests/test_config.py::test_partial_arguments[savgol_false] PASSED
+tests/test_config.py::test_partial_arguments[savgol_window] PASSED
+tests/test_config.py::test_partial_arguments[savgol_window_degree] PASSED
+tests/test_config.py::test_partial_arguments[savgol_window_str_min] PASSED
+tests/test_config.py::test_partial_arguments[savgol_window_str_sec] PASSED
+tests/test_config.py::test_to_toml[AlignmentMethod] PASSED
+tests/test_config.py::test_to_toml[ConsolidateMethod] PASSED
+tests/test_config.py::test_to_toml[IntensityMatrixMethod] PASSED
+tests/test_config.py::test_to_toml[Method] PASSED
+tests/test_config.py::test_to_toml[PeakDetectionMethod] PASSED
+tests/test_config.py::test_to_toml[PeakFilterMethod] PASSED
+tests/test_config.py::test_to_toml[SavitzkyGolayMethod] PASSED
 tests/test_decoder.py::test_decoder PASSED
 tests/test_encoder.py::test_encoder[array_of_tables] PASSED
 tests/test_encoder.py::test_encoder[dict_value] PASSED
@@ -342,6 +383,6 @@ tests/tests_for_tomliw/test_valid.py::test_valid[unicode-literal] PASSED
 tests/tests_for_tomliw/test_write_file.py::test_dump PASSED
 
 ============================= slowest 25 durations =============================
-======== 331 passed ========
+======== 372 passed ========
   py$(PYV): OK
   congratulations :)