Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Filename fixes #46

Merged
merged 7 commits into from
Mar 6, 2024
Merged

Filename fixes #46

merged 7 commits into from
Mar 6, 2024

Conversation

bleonar5
Copy link
Contributor

This PR closes issue #43 and represents the last major chunk of issue #25

I've consolidated the properties used to identify files in _findRuleMatches and factored out the match conditions to their own function, which hopefully makes things clearer and neater.

  • Now all file rules have the arbitraryNesting, baseDir, and extensions properties, along with either the suffix or the stem property.
  • All directory rules have the path and directory properties.
  • Files meant to be located in the root directory now have baseDir value "/" and arbitraryNesting value "false", indicating that they must be found directly within the root directory, with no intervening subdirectories.

Some other minor changes include an update to the name for the property that indicates that a datafile's columns must match the "variableMeasured" property in the metadata. "columns" -> "columnsMatchMetadata"

I also included some miscellaneous updates to the default ignore list that I noticed in the process of development.

As for the big-picture issue regarding the difficulty syncing up psych-DS and psychds-validator versions during development, I realized that the simple and obvious solution to this is to actually make use of the "versions" that I've built into the schema_model repository. That is, when I make an update to the schema model from this point on, I will always make sure to add it in a new directory within the repo, with an incremented version number such as 1.X.X. With this, I can make sure that all psychds-validator branches point to specific versions of the schema model rather than always grabbing the 'latest' version.

Brian Leonard added 7 commits February 22, 2024 10:58
…a are now located under compiled_metadata rather than dataset_description, and the rules are triggered by encountered a datafile rather than a metadata object (since the rules must be applied to the fully compiled metadata object, whose inheritance depends on datafile location)
…eprecated in cases where the object is not a directory; stem and suffix are mutually exclusive, arbitraryNesting applies to all filename rules
@bleonar5 bleonar5 merged commit 2e1d238 into main Mar 6, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant