-
Notifications
You must be signed in to change notification settings - Fork 264
MRG: refactoring for pydicom 1.0 #599
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
MRG: refactoring for pydicom 1.0 #599
Conversation
e244769
to
94f9c10
Compare
Codecov Report
@@ Coverage Diff @@
## master #599 +/- ##
==========================================
+ Coverage 93.4% 94.46% +1.05%
==========================================
Files 189 177 -12
Lines 25820 24943 -877
Branches 2752 2661 -91
==========================================
- Hits 24118 23562 -556
+ Misses 1205 908 -297
+ Partials 497 473 -24
Continue to review full report at Codecov.
|
58ae278
to
9f9cc3e
Compare
@@ -34,29 +33,29 @@ matrix: | |||
# Absolute minimum dependencies | |||
- python: 2.7 | |||
env: | |||
- DEPENDS="numpy==1.7.1" PYDICOM=0 | |||
- DEPENDS="numpy==1.7.1" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wasn't the idea here to make sure that we didn't break when pydicom was absent? Do we want to move to a pydicom dependency?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wow, brain failure. I see this replaces the pydicom dependency above. Carry on.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With this matrix entry, Pydicom isn't in the DEPENDS variable, and doesn't get installed. On the way, the tests did in fact fail when Pydicom wasn't present, I had to fix the code to make it work again. Have a look at the Travis-CI log to confirm this entry does not install Pydicom...
This looks reasonable. The AppVeyor build seems to have failed for its own reasons (I can't restart it; not sure if that's a thing in AppVeyor). |
Test against master branch. Remove awkward special casing for Python 3.
Versions < 0.9.9 now break on install when they try to use http to install the 'distribute' package.
9f9cc3e
to
618d02a
Compare
I reverted a couple of the modifications, because pydicom has fixed them already... |
Thanks Chris for the review. |
Make tests pass against pydicom 1.0.
Refactor CI to test pydicom master, as suggested by pydicom folks.
Update minimum pydicom dependency to 0.9.9 (previous versions no longer install).