-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Move restoration and color data to the combined data directory #3324
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
Conversation
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.
Great! My experience with Pathlib is that it's great until it breaks (some function, even within the standard library, accepts a Path but really they mean a string and they do stringy things to it), but since it works fine here with np.load, this LGTM. Thanks!
@jni, so it didn't work right, not with the min requirements. I'll just add a "'string" to the front of the path to cast it as one. |
Codecov Report
@@ Coverage Diff @@
## master #3324 +/- ##
=========================================
+ Coverage 86.77% 86.8% +0.02%
=========================================
Files 339 339
Lines 27380 27386 +6
=========================================
+ Hits 23760 23773 +13
+ Misses 3620 3613 -7
Continue to review full report at Codecov.
|
944818d
to
744af7e
Compare
I feel like this whole string -> path is a going to be a repeat of bytearray -> string |
@@ -1,15 +1,22 @@ | |||
from os.path import abspath, dirname, join as pjoin | |||
from pathlib import Path |
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.
I've probably missed a trend... Is os.path.join
too mainstream now?
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.
I decided I want to backport this, and it might be better to just use os.path.join for an other year.
744af7e
to
c6fa52b
Compare
There is also some data in |
@soupault I moved that data, but it was a really small file. The data in restoration was quite large. |
@hmaarrfk I was mentioning the ones from |
🎠 |
Thats ok. Depending on @jni's comments, I can revert them quite easily. Undoing the revert would be harder ;) |
I agree with @soupault, I like the consistency of having all data files under one tree. However I wouldn't mind a third @scikit-image/core chiming in. |
9e8c0ff
to
0ddb13d
Compare
It's not a bad thing to combine. I think it is interesting maintain the distinction between the data that can be used for a broad range of things (what the current data is) and the data used for specific tests (that the common users will never care about). In the taste of keeping things separate a little, wouldn't be interesting to do not put theses data in tests/ (that I associate with the tests for data/) and move them in a directory named like "for_unittests" (or anything better). |
Francois. The data used for tests is moved to the the data/tests directory.
A regular user should not be tempted to go there. Does that tick the box
for your requirements?
…On Mon, Aug 13, 2018 at 6:28 AM François Boulogne ***@***.***> wrote:
Another thought. In case we go to the online solution, we have to ensure
the integrity of these images (imagine dealing with bug reports due to
corrupted images...)
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#3324 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAFfmJ1R0qmT1JGkmdDxXMQzWzhyoWi-ks5uQVTagaJpZM4Vvj-O>
.
|
For my point number 1, yes :) That point was just to underline the importance to keep things tidy. About my point number 2, I would say no. Usually, skimage/SUBMODULE/tests contains the tests of SUBMODULE, not the data for another part. Here, skimade/data/tests contains the tests for our front-end data. Therefore, I suggested to put the files somewhere else, like skimage/data/for_unittests (but the name is not excellent...). Is that clear? |
got it!
…On Mon, Aug 13, 2018 at 9:19 AM François Boulogne ***@***.***> wrote:
For my point number 1, yes :) That point was just to underline the
importance to keep things tidy. About my point number 2, I would say no.
Usually, skimage/SUBMODULE/tests contains the tests of SUBMODULE, not the
data for another part. Here, skimade/data/tests contains the tests for our
front-end data. Therefore, I suggested to put the files somewhere else,
like skimage/data/for_unittests (but the name is not excellent...). Is that
clear?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#3324 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAFfmKDFrZ0gpO1W0tUumIJUfJtfERCFks5uQXzmgaJpZM4Vvj-O>
.
|
lets see what happens with the cis. |
it works :) |
Can we just leave this as is for a while? Maybe we can think of a better way in a bit, I'm fine with having this one wait until we are ready to pull the trigger on a real solution for splitting off the data package. I can touchup this PR if it needs to in th near future. |
@hmaarrfk Should we close this PR? Turn it to an issue? |
I think it can just be closed. Pooch dealt with this |
It would make it easier to think about what we want to do with all this data:
#3323
(I'm not sure if this will pass on python 3.5 since I usedpathlib
)