Skip to content

Conversation

@scaramallion
Copy link
Member

Describe the changes

Updates US1_UNCI.dcm with the correct uncompressed pixel data

Tasks

  • In a branch on your fork of pydicom-data, add or modify data files
  • Create a pull request for pydicom-data
  • Update the commit hash for the urls in a fork/branch of the pydicom file [urls.json]https://github.com/pydicom/pydicom/blob/master/pydicom/data/urls.json and create a pydicom pull request
  • pydicom unit tests passing

@scaramallion
Copy link
Member Author

scaramallion commented Jul 20, 2020

@darcymason I'm a little confused how this works now, the pydicom unit tests should still pass because the download URL refers to a particular commit? Should the urls.json file be updated after this is merged or do you want a paired PR so both are available to be merged (presumably after this one is merged the other has its actions run with the updated -data then merged)?

Although, won't I only know the commit hash after the squash + merge? Not sure how/when the hashes are generated

@darcymason
Copy link
Member

I'm a little confused how this works now, the pydicom unit tests should still pass because the download URL refers to a particular commit? Should the urls.json file be updated after this is merged or do you want a paired PR so both are available to be merged (presumably after this one is merged the other has its actions run with the updated -data then merged)?

I'm still kind of working through this too, but I think everything you said is right. We can commit here first without affecting previous pydicom because it has the exact commit hash (not the new one from this PR). Then update the pydicom urls.json (replace-all of the old commit hash with the new one from this PR) -- only pydicom tests associated with files changed in this PR will be affected in pydicom, all others unchanged between commits.

@scaramallion
Copy link
Member Author

scaramallion commented Jul 20, 2020

Sorry, I updated things while you were answering:

Although, won't I only know the commit hash after the squash + merge?

Looking at the master history a new hash is generated on squash + merge

@darcymason
Copy link
Member

Looking at the master history a new hash is generated on squash + merge

Right, so I should update the PR template again to be a little more specific about that, and the checklist isn't really completed here, so maybe separate into two checklists- pre and post merge here.

Are you ready to merge this now? I'm not sure of rights on this one, you should probably have them. And looks like does not require official review, which I think is fine.

@darcymason
Copy link
Member

I'm knocking off for the night - I'll pick up on anything else needed from me tomorrow.

@scaramallion
Copy link
Member Author

Yep its ready

@scaramallion scaramallion merged commit 5a26479 into pydicom:master Jul 20, 2020
@scaramallion scaramallion changed the title [WIP] Fix incorrect uncompressed dataset [MRG] Fix incorrect uncompressed dataset Jul 20, 2020
@scaramallion scaramallion deleted the update_ds branch July 20, 2020 02:02
@darcymason
Copy link
Member

Hmmm... it says you've merged it into master but I'm still see the Merge button on github ... ? I'll just close the PR as it looks like the correct commit url is used in pydicom.

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.

2 participants