diff --git a/dev_requirements/requirements-build_executable.txt b/dev_requirements/requirements-build_executable.txt index 038dae5..e26ec7f 100644 --- a/dev_requirements/requirements-build_executable.txt +++ b/dev_requirements/requirements-build_executable.txt @@ -1,18 +1,21 @@ +# SHA1:a75cd902b521bdce592b451b2288a7e7e89edbc7 # -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: +# This file is autogenerated by pip-compile-multi +# To update, run: # -# pip-compile dev_requirements/requirements-build_executable.in +# pip-compile-multi # -altgraph==0.17.3 +altgraph==0.17.4 # via pyinstaller -packaging==23.2 - # via - # pyinstaller - # pyinstaller-hooks-contrib -pyinstaller==6.4.0 - # via -r dev_requirements/requirements-build_executable.in -pyinstaller-hooks-contrib==2024.1 +packaging==24.0 + # via pyinstaller +pefile==2023.2.7 + # via pyinstaller +pyinstaller==6.6.0 + # via -r dev_requirements\requirements-build_executable.in +pyinstaller-hooks-contrib==2024.6 + # via pyinstaller +pywin32-ctypes==0.2.2 # via pyinstaller # The following packages are considered to be unsafe in a requirements file: diff --git a/dev_requirements/requirements-coverage.txt b/dev_requirements/requirements-coverage.txt index f8bc509..c2c489a 100644 --- a/dev_requirements/requirements-coverage.txt +++ b/dev_requirements/requirements-coverage.txt @@ -1,8 +1,9 @@ +# SHA1:6dafbcf610e9f81897b65ee9142715ab2e793f9e # -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: +# This file is autogenerated by pip-compile-multi +# To update, run: # -# pip-compile requirements-coverage.in +# pip-compile-multi # -coverage==7.4.1 - # via -r dev_requirements/requirements-coverage.in +coverage==7.5.1 + # via -r dev_requirements\requirements-coverage.in diff --git a/dev_requirements/requirements-docs.txt b/dev_requirements/requirements-docs.txt index 8ac074f..18eeeef 100644 --- a/dev_requirements/requirements-docs.txt +++ b/dev_requirements/requirements-docs.txt @@ -1,58 +1,60 @@ +# SHA1:c8e7f810d1ef3d2747c05687c62856943f9e1faa # -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: +# This file is autogenerated by pip-compile-multi +# To update, run: # -# pip-compile requirements-docs.in +# pip-compile-multi # -alabaster==0.7.13 +alabaster==0.7.16 # via sphinx -babel==2.12.1 +babel==2.15.0 # via sphinx -certifi==2023.7.22 +certifi==2024.2.2 # via requests -charset-normalizer==3.1.0 +charset-normalizer==3.3.2 # via requests -docutils==0.18.1 +colorama==0.4.6 + # via sphinx +docutils==0.20.1 # via # sphinx # sphinx-rtd-theme -idna==3.4 +idna==3.7 # via requests imagesize==1.4.1 # via sphinx -jinja2==3.1.3 +jinja2==3.1.4 # via sphinx -markupsafe==2.1.2 +markupsafe==2.1.5 # via jinja2 -packaging==23.0 +packaging==24.0 # via sphinx -pygments==2.15.0 +pygments==2.18.0 # via sphinx requests==2.31.0 # via sphinx snowballstemmer==2.2.0 # via sphinx -sphinx==7.2.6 +sphinx==7.3.7 # via - # -r dev_requirements/requirements-docs.in + # -r dev_requirements\requirements-docs.in # sphinx-rtd-theme # sphinxcontrib-jquery - # sphinxcontrib-serializinghtml sphinx-rtd-theme==2.0.0 - # via -r dev_requirements/requirements-docs.in -sphinxcontrib-applehelp==1.0.4 + # via -r dev_requirements\requirements-docs.in +sphinxcontrib-applehelp==1.0.8 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==1.0.6 # via sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.0.5 # via sphinx sphinxcontrib-jquery==4.1 # via sphinx-rtd-theme sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==1.0.7 # via sphinx -sphinxcontrib-serializinghtml==1.1.9 +sphinxcontrib-serializinghtml==1.1.10 # via sphinx -urllib3==1.26.18 +urllib3==2.2.1 # via requests diff --git a/dev_requirements/requirements-formatting.txt b/dev_requirements/requirements-formatting.txt index 1aac402..cb138ad 100644 --- a/dev_requirements/requirements-formatting.txt +++ b/dev_requirements/requirements-formatting.txt @@ -1,20 +1,23 @@ +# SHA1:2c7ffcd29222de3114c7f7994911f1b69d06b6b3 # -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: +# This file is autogenerated by pip-compile-multi +# To update, run: # -# pip-compile requirements-formatting.in +# pip-compile-multi # -black==24.2.0 - # via -r dev_requirements/requirements-formatting.in +black==24.4.2 + # via -r dev_requirements\requirements-formatting.in click==8.1.7 # via black +colorama==0.4.6 + # via click isort==5.13.2 - # via -r dev_requirements/requirements-formatting.in + # via -r dev_requirements\requirements-formatting.in mypy-extensions==1.0.0 # via black -packaging==23.0 +packaging==24.0 # via black -pathspec==0.11.1 +pathspec==0.12.1 # via black -platformdirs==3.2.0 +platformdirs==4.2.2 # via black diff --git a/dev_requirements/requirements-integration_tests.txt b/dev_requirements/requirements-integration_tests.txt index 14e57e1..2a8b2df 100644 --- a/dev_requirements/requirements-integration_tests.txt +++ b/dev_requirements/requirements-integration_tests.txt @@ -1,18 +1,21 @@ +# SHA1:9a7908bf3a242580d708919410d51c88e978c1db # -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: +# This file is autogenerated by pip-compile-multi +# To update, run: # -# pip-compile requirements-integration_tests.in +# pip-compile-multi # +colorama==0.4.6 + # via pytest iniconfig==2.0.0 # via pytest -packaging==23.0 +packaging==24.0 # via pytest pluggy==1.5.0 # via pytest pytest==8.2.0 # via - # -r dev_requirements/requirements-integration_tests.in + # -r dev_requirements\requirements-integration_tests.in # pytest-datafiles pytest-datafiles==3.0.0 - # via -r dev_requirements/requirements-integration_tests.in + # via -r dev_requirements\requirements-integration_tests.in diff --git a/dev_requirements/requirements-json_schemas.txt b/dev_requirements/requirements-json_schemas.txt new file mode 100644 index 0000000..9187b70 --- /dev/null +++ b/dev_requirements/requirements-json_schemas.txt @@ -0,0 +1,13 @@ +# SHA1:9062d7262d59cedbfce598bf02e353c1bab0a987 +# +# This file is autogenerated by pip-compile-multi +# To update, run: +# +# pip-compile-multi +# +marshmallow==3.21.2 + # via marshmallow-jsonschema +marshmallow-jsonschema==0.13.0 + # via -r dev_requirements\requirements-json_schemas.in +packaging==24.0 + # via marshmallow diff --git a/dev_requirements/requirements-linting.txt b/dev_requirements/requirements-linting.txt index 99b0329..1a3aa46 100644 --- a/dev_requirements/requirements-linting.txt +++ b/dev_requirements/requirements-linting.txt @@ -1,20 +1,23 @@ +# SHA1:0e15f8789b9d62fe90d1f1b0b6a7e32f13b99b19 # -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: +# This file is autogenerated by pip-compile-multi +# To update, run: # -# pip-compile requirements-linting.in +# pip-compile-multi # -astroid==3.1.0 +astroid==3.2.0 # via pylint -dill==0.3.7 +colorama==0.4.6 + # via pylint +dill==0.3.8 # via pylint isort==5.13.2 # via pylint mccabe==0.7.0 # via pylint -platformdirs==3.2.0 +platformdirs==4.2.2 # via pylint -pylint==3.1.1 - # via -r dev_requirements/requirements-linting.in -tomlkit==0.11.7 +pylint==3.2.0 + # via -r dev_requirements\requirements-linting.in +tomlkit==0.12.5 # via pylint diff --git a/dev_requirements/requirements-test_packaging.txt b/dev_requirements/requirements-test_packaging.txt index cef51a7..1fbf0e3 100644 --- a/dev_requirements/requirements-test_packaging.txt +++ b/dev_requirements/requirements-test_packaging.txt @@ -1,36 +1,35 @@ +# SHA1:93e4fbf2b6cce1574fe3d5315360512fa9927699 # -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: +# This file is autogenerated by pip-compile-multi +# To update, run: # -# pip-compile dev_requirements/requirements-test_packaging.in +# pip-compile-multi # -build==1.1.1 - # via -r dev_requirements/requirements-test_packaging.in +backports-tarfile==1.1.1 + # via jaraco-context +build==1.2.1 + # via -r dev_requirements\requirements-test_packaging.in certifi==2024.2.2 # via requests -cffi==1.16.0 - # via cryptography charset-normalizer==3.3.2 # via requests -cryptography==42.0.5 - # via secretstorage -docutils==0.20.1 +colorama==0.4.6 + # via build +docutils==0.21.2 # via readme-renderer -idna==3.6 +idna==3.7 # via requests importlib-metadata==7.1.0 - # via twine -jaraco-classes==3.3.1 + # via + # keyring + # twine +jaraco-classes==3.4.0 # via keyring -jaraco-context==4.3.0 +jaraco-context==5.3.0 # via keyring -jaraco-functools==4.0.0 +jaraco-functools==4.0.1 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage -keyring==25.0.0 +keyring==25.2.1 # via twine markdown-it-py==3.0.0 # via rich @@ -40,20 +39,20 @@ more-itertools==10.2.0 # via # jaraco-classes # jaraco-functools -nh3==0.2.15 +nh3==0.2.17 # via readme-renderer packaging==24.0 # via build pkginfo==1.10.0 # via twine -pycparser==2.21 - # via cffi -pygments==2.17.2 +pygments==2.18.0 # via # readme-renderer # rich -pyproject-hooks==1.0.0 +pyproject-hooks==1.1.0 # via build +pywin32-ctypes==0.2.2 + # via keyring readme-renderer==43.0 # via twine requests==2.31.0 @@ -66,13 +65,11 @@ rfc3986==2.0.0 # via twine rich==13.7.1 # via twine -secretstorage==3.3.3 - # via keyring twine==5.0.0 - # via -r dev_requirements/requirements-test_packaging.in + # via -r dev_requirements\requirements-test_packaging.in urllib3==2.2.1 # via # requests # twine -zipp==3.18.1 +zipp==3.18.2 # via importlib-metadata diff --git a/dev_requirements/requirements-type_check.txt b/dev_requirements/requirements-type_check.txt index 820130b..987d5b0 100644 --- a/dev_requirements/requirements-type_check.txt +++ b/dev_requirements/requirements-type_check.txt @@ -1,14 +1,15 @@ +# SHA1:da3e663746c4ba081481cd87909f5e74fcb5851a # -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: +# This file is autogenerated by pip-compile-multi +# To update, run: # -# pip-compile dev_requirements/requirements-type_check.in +# pip-compile-multi # mypy==1.10.0 - # via -r dev_requirements/requirements-type_check.in + # via -r dev_requirements\requirements-type_check.in mypy-extensions==1.0.0 # via mypy types-xmltodict==0.13.0.3 - # via -r dev_requirements/requirements-type_check.in -typing-extensions==4.7.1 + # via -r dev_requirements\requirements-type_check.in +typing-extensions==4.11.0 # via mypy diff --git a/dev_requirements/requirements-unit_tests.txt b/dev_requirements/requirements-unit_tests.txt index 16be611..c20feca 100644 --- a/dev_requirements/requirements-unit_tests.txt +++ b/dev_requirements/requirements-unit_tests.txt @@ -1,14 +1,17 @@ +# SHA1:a0cccddeadc81e9f98ff0eb366cdcc25f560e9f6 # -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: +# This file is autogenerated by pip-compile-multi +# To update, run: # -# pip-compile requirements-unit_tests.in +# pip-compile-multi # +colorama==0.4.6 + # via pytest iniconfig==2.0.0 # via pytest jsonpath-ng==1.6.1 - # via -r dev_requirements/requirements-unit_tests.in -packaging==23.0 + # via -r dev_requirements\requirements-unit_tests.in +packaging==24.0 # via pytest pluggy==1.5.0 # via pytest @@ -16,10 +19,10 @@ ply==3.11 # via jsonpath-ng pytest==8.2.0 # via - # -r dev_requirements/requirements-unit_tests.in + # -r dev_requirements\requirements-unit_tests.in # pytest-asyncio # pytest-datafiles -pytest-asyncio==0.23.5 - # via -r dev_requirements/requirements-unit_tests.in +pytest-asyncio==0.23.6 + # via -r dev_requirements\requirements-unit_tests.in pytest-datafiles==3.0.0 - # via -r dev_requirements/requirements-unit_tests.in + # via -r dev_requirements\requirements-unit_tests.in diff --git a/requirements.txt b/requirements.txt index 61d10e1..f5d79d4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,7 +16,7 @@ marshmallow==3.21.2 # via -r requirements.in more-itertools==10.2.0 # via -r requirements.in -packaging==23.0 +packaging==24.0 # via marshmallow xmltodict==0.13.0 # via -r requirements.in diff --git a/src/maus/navigation.py b/src/maus/navigation.py index a8a0139..dc413bf 100644 --- a/src/maus/navigation.py +++ b/src/maus/navigation.py @@ -646,8 +646,12 @@ def determine_locations( # [SG2 (NAD+MS), SG3]->[SG2 (NAD+MR)] # one group up (leave SG3, then remove old SG2) # [SG4, SG8, SG10]-> [SG4,SG12] # two groups up! (leave SG10, leave SG8, then enter sg12) common_ancestor = _find_common_ancestor_from_sgh( - last(last(result)[1].layers).segment_group_key, this_ahb_line.segment_group_key, segment_group_hierarchy + # pylint:disable=unsubscriptable-object + last(last(result)[1].layers).segment_group_key, + this_ahb_line.segment_group_key, + segment_group_hierarchy, ) + # pylint:disable=unsubscriptable-object distance_to_common_ancestor = calculate_distance(last(result)[1], common_ancestor) for _ in range(0, distance_to_common_ancestor.layers_up): # actually: this should be a separate case in the differential change enum