Repository navigation
Conversation
Collaborator
|
Thanks for re-opening on this repository. I'll give it a thorough review |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Scope
Copies
deeplabcut/core/config/andDLCDeprecationWarningfrom DeepLabCutdev(14b9c497d). The code is unchanged apart from import paths and licence headers. DeepLabCut will then import them from here. Same content as DeepLabCut/DLClibrary#56, plusreject_reserved_keys(added ondevafterv3.0.2).Moved
dlccore/config/:base_config(DLCBaseConfig,DLCVersionedConfig),project_config(ProjectConfig),versioning,validation, and fromutilsthe functionsread_config_as_dict,write_config,get_yaml_loader,get_yaml_dumper,resolve_alias,resolve_aliases_in_dict,normalize_for_serialization,pretty_print.dlccore/deprecation.py:DLCDeprecationWarningonly.tests/config/: DeepLabCut'stests/core/config/, minus the tests of the functions listed below. Theopenfield-Pranav-2018-10-30/config.yamlfixture is copied verbatim from DeepLabCut'sexamples/.pydantic>=2.1,<3,numpy>=1.22.4(DeepLabCut's floor),ruamel-yaml>=0.16,typing-extensions.Not moved
deeplabcut/core/config/utils.pyread_configengine,project_path, detector defaults); ideally reading in dlccore should not write. Used in 51 DeepLabCut files.write_project_configedit_configcreate_config_template@deprecated.create_config_template_3d,write_config_3d,write_config_3d_templateensure_plain_configDLCBaseConfigfrom here.deeplabcut/core/deprecation.py:DeprecationInfo,@deprecatedand@renamed_parameterstay, used in 27 DeepLabCut files. Only the classDLCDeprecationWarningmoves sinceresolve_aliasraises it.DeepLabCut imports it back, so that existing filters and
pytest.warnsstill match.dlccore does not gain
packaging, which onlyDeprecationInfoneeds.We could move the rest of deprecation-related code separately.
PoseConfigmigrations: the two placeholderPoseConfigmigrations inversioning(both no-ops) stay in DeepLabCut.Not moved for now
PoseConfig: its schema is a candidate for dlccore, kept alongsideProjectConfigas suggested on DLClibrary#56, but builders depend on DeepLabCut's runtime (pose templates, transforms, model zoo). I suggest a separate PR in any case.pyproject.toml, so they diff cleanly against DeepLabCut. Lint fixes come in a separate PR; until then it's a strict xfail.ProjectConfig.from_yamlstill resolvesproject_pathin memory. The readers that move (read_config_as_dict,from_yaml) do not write in DeepLabCut either; the one that writes back,read_config, stays.CURRENT_CONFIG_VERSION, so aProjectConfigversion bump still forces aPoseConfigmigration.