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.

Sign up for GitHub

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

Jump to bottom

[bug fix] Added includesType parameter when using walk function #1281

Merged
merged 5 commits into from
Aug 15, 2023
Merged

[bug fix] Added includesType parameter when using walk function #1281

merged 5 commits into from
Aug 15, 2023

Conversation

linglp
Copy link
Contributor

@linglp linglp commented Aug 10, 2023 •
edited
Loading

Related to Jira: https://sagebionetworks.jira.com/browse/FDS-883

Changelog

  • added IncludeTypes parameter when calling getFilesInStorageDataset
  • added unit test for getFilesInStorageDataset function
  • re-order import statement

Note: when writing unit test, I noticed that we are not catching cases where fileNames is not None in getFilesInStorageDataset function. See jira issue FDS 889 for details

@linglp linglp marked this pull request as ready for review August 10, 2023 16:02
@linglp linglp mentioned this pull request Aug 9, 2023
Merged
thomasyu888
thomasyu888 approved these changes Aug 10, 2023
View reviewed changes
Copy link
Member

@thomasyu888 thomasyu888 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Going to pre-approve, but this looks good.

Might want to confirm with everyone that file and folder is all you want.

tests/test_store.py Outdated Show resolved Hide resolved
schematic/store/synapse.py Outdated Show resolved Hide resolved
mialy-defelice
mialy-defelice approved these changes Aug 15, 2023
View reviewed changes
Copy link
Contributor

@mialy-defelice mialy-defelice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checked current output on develop and on this branch and see it working as expected. Great catch @linglp !

@linglp linglp merged commit ceb0b47 into develop Aug 15, 2023
3 checks passed
@linglp linglp deleted the develop-fix-getfilesindataset branch August 15, 2023 20:17
@linglp
Copy link
Contributor Author

linglp commented Aug 16, 2023 •
edited
Loading

Per discussion in code review, we should avoid calling walk function since we already have file view. Also need to make sure annotations are in file view.

@andrewelamb andrewelamb mentioned this pull request Aug 24, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mialy-defelice mialy-defelice mialy-defelice approved these changes

@thomasyu888 thomasyu888 thomasyu888 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@linglp @thomasyu888 @mialy-defelice