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

Fix/155 change to return results from detect when recipe does not contain filters #156

Merged
merged 25 commits into from
Oct 2, 2020

Conversation

mjcbello
Copy link
Contributor

@mjcbello mjcbello commented Oct 2, 2020

Description

Related issues: #155

Change to return results from detect when recipe does not contain filters.

Checklist

  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • My code follows the style guidelines of this project

Open questions

Questions that require more discussion or to be addressed in future development:

wetzelj and others added 24 commits February 26, 2020 12:08
… and values from specified tags. Changes inspired by modifications within howardpchen's fork of pydicom/deid.
Added sections describing the usage of the new private tag screening functionality which was added to the replace_identifiers method.
Changed default on screen_values  from [] to None.
…patterns and values from specified tags. Changes inspired by modifications within howardpchen's fork of pydicom/deid."

This reverts commit f839e2f.
@wetzelj
Copy link
Contributor

wetzelj commented Oct 2, 2020

@vsoch - I have no clue what we did to include all of those remote-tracking merges... Let us know if we should do something different.

@vsoch
Copy link
Member

vsoch commented Oct 2, 2020

When we merge PRs, I believe we squash and merge. So likely what you did here is rebase off of your master (with the older commits) - the changes you see are represented in master here, but since the commits are not, they appear here. If we squash and merge it should get rid of them all and just add one commit (and I'll ensure that the message doesn't include the old ones). And next time what you would want to do is generally always have your master in sync with deid master, meaning to never do a PR from your master to deid.

CHANGELOG.md Outdated Show resolved Hide resolved
deid/dicom/pixels/detect.py Outdated Show resolved Hide resolved
@vsoch vsoch merged commit 0df93de into pydicom:fix/153 Oct 2, 2020
@wetzelj wetzelj deleted the fix/155 branch November 21, 2022 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants