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

0.2.29 rc #199

Closed
wants to merge 7 commits into from
Closed

0.2.29 rc #199

wants to merge 7 commits into from

Conversation

vsoch
Copy link
Member

@vsoch vsoch commented Dec 20, 2021

Description

@glebsts just opening this so when you have tested and are ready we can merge into master. Definitely no rush, we can do after the holiday! I just want to make sure I don't forget :)

glebsts and others added 3 commits November 4, 2021 02:19
updated pydicom dependency from 2.1.1 to 2.2.2
* #197 'remove and keep combo' - added tests that describe situation where remove overrules keep, and also explicitly show that except is using value as substring/regex match
* #197 'remove and keep combo' - added quite straightforward "add fields marked with KEEP to skiplist", also fixed docstring on parser#perform_action and removed unused parameter, fixed typo in random place
* #197 'remove and keep combo' - quotes changed as per code format convention
* #197 'remove and keep combo' - changed keep list to be separate property, updated docs on action order, added two tests for ensuring blank action order
* #197 'remove and keep combo' - changed keep fields collector to be more pythonic
* #197 'remove and keep combo' - more safeguards in keep fields collector, clarified docs upon field that should not be None

* #197 'remove and keep combo' - changelog update, typo fix, version bump
@glebsts
Copy link
Contributor

glebsts commented Dec 20, 2021

ack. Have a plan of testing new version in real env this/next week.

@vsoch
Copy link
Member Author

vsoch commented Mar 14, 2022

ping @glebsts !

@glebsts
Copy link
Contributor

glebsts commented Mar 16, 2022

Hello there, sorry for being late, some focus shift.
Re this PR: we tested that on our system and figured out that we also need REPLACE to dominate above REMOVE ALL. Without that it became not so useful.
We ended up with switching to own implementation with other tech stack, but if you would accept additional commits in this PR with add replace fields to exceptions from remove all, I would gladly make it.

@vsoch
Copy link
Member Author

vsoch commented Mar 16, 2022

yep, that would work, and just make sure to document everything very clearly so there is no doubt about the functionality and order of things.

Pinging @wetzelj to get his feedback on these changes!

@wetzelj
Copy link
Contributor

wetzelj commented Mar 17, 2022

I've been keeping an eye on this issue/pr and am totally on board with the functionality changes/add. At the moment, we've been working on some other additions to our application that uses pydicom/deid, so we've stuck at 0.2.28, but intend to update to latest (and/or this rc) in the next month or so.

@vsoch
Copy link
Member Author

vsoch commented Mar 17, 2022

Fantastic! So @glebsts go ahead if you want to PR your changes to this branch - we can review / discuss and then get that 0.0.29 finalized.

@glebsts
Copy link
Contributor

glebsts commented Mar 17, 2022

@vsoch hey, just to clarify - which branch should I should I send PR to (and from which branch better to do it)?

@vsoch
Copy link
Member Author

vsoch commented Mar 17, 2022

I think if we want it to extend the work here, it would make sense to PR TO 0.2.29-rc. Is there a better way you have in mind?

@glebsts
Copy link
Contributor

glebsts commented Mar 17, 2022

no, just got lost a little bit. Thank you, will work now

… fields being jittered or replaced to prevent them from being removed, tests, extended description of @keep property, changelog update, typo fix, version bump
@glebsts
Copy link
Contributor

glebsts commented Mar 17, 2022

#204

@vsoch
Copy link
Member Author

vsoch commented Mar 18, 2022

okay changes from @glebsts are merged when you have some time @wetzelj ! And looks like I can rename the branch, but it will close the PR! Let's finish review, and I'll rename before merge so it's clear.

@vsoch
Copy link
Member Author

vsoch commented Oct 8, 2022

I think we followed up here with a new PR, so its safe to close. Thanks everyone!

@vsoch vsoch closed this Oct 8, 2022
@wetzelj
Copy link
Contributor

wetzelj commented Nov 18, 2022

Hi @vsoch - I think this PR was prematurely closed. When I first saw that this was closed, I did notice that #204 had been merged, but on closer review, #198 and #204 were merged into this PR, #204 wasn't a replacement PR that was merged into master.

Since this was closed and not merged, these changes never made it into master (or subsequent branches).

I am currently testing against PR #234. What do you think about the possibility of merging this into that PR? I still believe that there's definite merit to the changes that were introduced here.

@vsoch
Copy link
Member Author

vsoch commented Nov 18, 2022

We sped past this particular release, so if someone wants to re-base and re-open, I'd be happy to review again! It's mostly an interest thing - 7 months with no response I figured it was outdated or not of interest, sorry about that.

@wetzelj
Copy link
Contributor

wetzelj commented Nov 18, 2022

Sounds good. I'll work on it next week. Is it okay if I base it off of #234 or would you prefer it be based off of master?

@vsoch
Copy link
Member Author

vsoch commented Nov 18, 2022

Whichever is easier to test! Both ultimately are going to be rebase off of master, so choose your pick.

@wetzelj
Copy link
Contributor

wetzelj commented Nov 21, 2022

Great! PR #237 created to merge these changes into #234.

vsoch added a commit that referenced this pull request Nov 21, 2022
* #193 'bump pydicom' - bumped pydicom to 2.2.2, local tests green, changelog update, added PyCharm to gitignore
* WIP 197 remove + keep combo should keep (#198)
* #197 'remove and keep combo' - added tests that describe situation where remove overrules keep, and also explicitly show that except is using value as substring/regex match
* #197 'remove and keep combo' - added quite straightforward "add fields marked with KEEP to skiplist", also fixed docstring on parser#perform_action and removed unused parameter, fixed typo in random place
* #197 'remove and keep combo' - quotes changed as per code format convention
* #197 'remove and keep combo' - changed keep list to be separate property, updated docs on action order, added two tests for ensuring blank action order
* #197 'remove and keep combo' - changed keep fields collector to be more pythonic
* #197 'remove and keep combo' - more safeguards in keep fields collector, clarified docs upon field that should not be None
* #197 'remove and keep combo' - changelog update, typo fix, version bump
* #197 'remove and replace/jitter combo' - added once-evaluated list of fields being jittered or replaced to prevent them from being removed, tests, extended description of @keep property, changelog update, typo fix, version bump
* #197 'remove and replace/jitter combo' - run black
* Update deid/version.py - agreed to bump to 0.3
* Bug with return of derive_ctp_coordinate
Downstream code expects coordinate definitions to be a comma separated list of values, not a list of ints.
* Update deid/dicom/parser.py
Committing suggestion.
* change derive_ctp_coordinates to private function

Co-authored-by: Gleb <[email protected]>
Co-authored-by: Vanessasaurus <[email protected]>
vsoch added a commit that referenced this pull request Nov 22, 2022
* add support for translating ctp coordinates
* version bump
* pin numpy and python 3.7, bump minor version
* Add/remove keep behavior (Previous PR #199 - 0.2.29 rc) (#237)

* #193 'bump pydicom' - bumped pydicom to 2.2.2, local tests green, changelog update, added PyCharm to gitignore
* WIP 197 remove + keep combo should keep (#198)
* #197 'remove and keep combo' - added tests that describe situation where remove overrules keep, and also explicitly show that except is using value as substring/regex match
* #197 'remove and keep combo' - added quite straightforward "add fields marked with KEEP to skiplist", also fixed docstring on parser#perform_action and removed unused parameter, fixed typo in random place
* #197 'remove and keep combo' - quotes changed as per code format convention
* #197 'remove and keep combo' - changed keep list to be separate property, updated docs on action order, added two tests for ensuring blank action order
* #197 'remove and keep combo' - changed keep fields collector to be more pythonic
* #197 'remove and keep combo' - more safeguards in keep fields collector, clarified docs upon field that should not be None
* #197 'remove and keep combo' - changelog update, typo fix, version bump
* #197 'remove and replace/jitter combo' - added once-evaluated list of fields being jittered or replaced to prevent them from being removed, tests, extended description of @keep property, changelog update, typo fix, version bump
* #197 'remove and replace/jitter combo' - run black
* Update deid/version.py - agreed to bump to 0.3
* Bug with return of derive_ctp_coordinate
Downstream code expects coordinate definitions to be a comma separated list of values, not a list of ints.
* Update deid/dicom/parser.py
Committing suggestion.
* change derive_ctp_coordinates to private function

Signed-off-by: vsoch <[email protected]>
Co-authored-by: Gleb <[email protected]>
Co-authored-by: Vanessasaurus <[email protected]>
Signed-off-by: vsoch <[email protected]>
Co-authored-by: wetzelj <[email protected]>
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.

3 participants