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

Consistent library naming #288

Merged
merged 6 commits into from
Jul 26, 2023
Merged

Consistent library naming #288

merged 6 commits into from
Jul 26, 2023

Conversation

tobyhodges
Copy link
Member

I took a pass through the lesson and made library names for Matplotlib, NumPy, and scikit-image consistent with how the projects refer to themselves. There were at least a couple of cases where I wasn't completely sure whether "skimage" or "scikit-image" was more appropriate but I think I took care of the vast majority of cases.

@tobyhodges tobyhodges added the type:formatting Formatting needs to be fixed label Jul 19, 2023
@github-actions
Copy link

github-actions bot commented Jul 19, 2023

Thank you!

Thank you for your pull request 😃

🤖 This automated message can help you check the rendered files in your submission for clarity. If you have any questions, please feel free to open an issue in {sandpaper}.

If you have files that automatically render output (e.g. R Markdown), then you should check for the following:

  • 🎯 correct output
  • 🖼️ correct figures
  • ❓ new warnings
  • ‼️ new errors

Rendered Changes

🔍 Inspect the changes: https://github.com/datacarpentry/image-processing/compare/md-outputs..md-outputs-PR-288

The following changes were observed in the rendered markdown documents:

 01-introduction.md         | 10 +++----
 02-image-basics.md         | 70 +++++++++++++++++++++-----------------------
 03-skimage-images.md       | 40 ++++++++++++-------------
 04-drawing.md              | 28 +++++++++---------
 05-creating-histograms.md  | 10 +++----
 06-blurring.md             | 18 +++++-------
 07-thresholding.md         | 26 ++++++++---------
 08-connected-components.md | 34 ++++++++++-----------
 09-challenges.md           |  4 +--
 discuss.md                 |  4 +--
 edge-detection.md          | 26 +++++++++--------
 index.md                   |  4 +--
 md5sum.txt                 | 28 +++++++++---------
 prereqs.md                 |  6 ++--
 setup.md                   | 73 ++++++++++++++++++++++------------------------
 15 files changed, 178 insertions(+), 203 deletions(-)
What does this mean?

If you have source files that require output and figures to be generated (e.g. R Markdown), then it is important to make sure the generated figures and output are reproducible.

This output provides a way for you to inspect the output in a diff-friendly manner so that it's easy to see the changes that occur due to new software versions or randomisation.

⏱️ Updated at 2023-07-25 13:00:01 +0000

github-actions bot pushed a commit that referenced this pull request Jul 19, 2023
github-actions bot pushed a commit that referenced this pull request Jul 25, 2023
Copy link
Contributor

@deppen8 deppen8 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great! That must have been a good amount of work, so thank you, @tobyhodges .

One caveat is that I didn't try to find any references that you might have missed, but I am sure we will discover those in time.

@tobyhodges
Copy link
Member Author

Thanks @deppen8

@tobyhodges tobyhodges merged commit 06c4504 into main Jul 26, 2023
@tobyhodges tobyhodges deleted the library-name-formatting branch July 26, 2023 07:19
github-actions bot pushed a commit that referenced this pull request Jul 26, 2023
Auto-generated via {sandpaper}
Source  : 06c4504
Branch  : main
Author  : Toby Hodges <tbyhdgs@gmail.com>
Time    : 2023-07-26 07:19:24 +0000
Message : Merge pull request #288 from datacarpentry/library-name-formatting

Consistent library naming
github-actions bot pushed a commit that referenced this pull request Jul 26, 2023
Auto-generated via {sandpaper}
Source  : 494d405
Branch  : md-outputs
Author  : GitHub Actions <actions@github.com>
Time    : 2023-07-26 07:21:37 +0000
Message : markdown source builds

Auto-generated via {sandpaper}
Source  : 06c4504
Branch  : main
Author  : Toby Hodges <tbyhdgs@gmail.com>
Time    : 2023-07-26 07:19:24 +0000
Message : Merge pull request #288 from datacarpentry/library-name-formatting

Consistent library naming
github-actions bot pushed a commit that referenced this pull request Aug 1, 2023
Auto-generated via {sandpaper}
Source  : 494d405
Branch  : md-outputs
Author  : GitHub Actions <actions@github.com>
Time    : 2023-07-26 07:21:37 +0000
Message : markdown source builds

Auto-generated via {sandpaper}
Source  : 06c4504
Branch  : main
Author  : Toby Hodges <tbyhdgs@gmail.com>
Time    : 2023-07-26 07:19:24 +0000
Message : Merge pull request #288 from datacarpentry/library-name-formatting

Consistent library naming
github-actions bot pushed a commit that referenced this pull request Aug 8, 2023
Auto-generated via {sandpaper}
Source  : 494d405
Branch  : md-outputs
Author  : GitHub Actions <actions@github.com>
Time    : 2023-07-26 07:21:37 +0000
Message : markdown source builds

Auto-generated via {sandpaper}
Source  : 06c4504
Branch  : main
Author  : Toby Hodges <tbyhdgs@gmail.com>
Time    : 2023-07-26 07:19:24 +0000
Message : Merge pull request #288 from datacarpentry/library-name-formatting

Consistent library naming
github-actions bot pushed a commit that referenced this pull request Aug 15, 2023
Auto-generated via {sandpaper}
Source  : 494d405
Branch  : md-outputs
Author  : GitHub Actions <actions@github.com>
Time    : 2023-07-26 07:21:37 +0000
Message : markdown source builds

Auto-generated via {sandpaper}
Source  : 06c4504
Branch  : main
Author  : Toby Hodges <tbyhdgs@gmail.com>
Time    : 2023-07-26 07:19:24 +0000
Message : Merge pull request #288 from datacarpentry/library-name-formatting

Consistent library naming
@mkcor
Copy link
Contributor

mkcor commented Sep 15, 2023

Hi @tobyhodges,

Sorry for my super late reply here!

There were at least a couple of cases where I wasn't completely sure whether "skimage" or "scikit-image" was more appropriate

I'll speak under @stefanv's control. Based on usage (e.g., see website's landing page), I would strictly parallel "skimage" vs "scikit-image" with "numpy" vs "NumPy". Therefore, in full sentences, in plain English, I would favour "scikit-image." I would use "skimage" when referring to code (and within code).

Following this convention, maybe the only 'leftover' would be in episode 02:

-while `skimage` is dedicated to performing operations on the images.
+while scikit-image is dedicated to performing operations on the images.

But this would raise the same question for "imageio" vs "ImageIO" (which I'm copying from sentences found in the official docs). Would @FirefoxMetzger agree?

@tobyhodges
Copy link
Member Author

Thanks for circling back, @mkcor. Happy to update episode 02 according to your recommendation, but I will wait to hear about ImageIO so that I can handle all modifications together.

@stefanv
Copy link

stefanv commented Sep 15, 2023

It doesn't look as though imageio is capitalized in their docs: https://imageio.readthedocs.io/en/stable/

@@ -8,11 +8,11 @@ exercises: 5

- Define the terms bit, byte, kilobyte, megabyte, etc.
- Explain how a digital image is composed of pixels.
- Recommend using imageio (resp. skimage) for I/O (resp. image processing) tasks.
- Recommend using imageio (resp. scikit-image) for I/O (resp. image processing) tasks.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm surprised by this change because this is the version we already have on main:

- Recommend using imageio (resp. scikit-image) for I/O (resp. image processing) tasks.

- Explain how images are stored in NumPy arrays.
- Explain the left-hand coordinate system used in digital images.
- Explain the RGB additive colour model used in digital images.
- Explain the order of the three colour values in skimage images.
- Explain the order of the three colour values in scikit-image images.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I'm not sure what 'scikit-image images' are... For now, in scikit-images, images are NumPy arrays (as taught in this lesson). Maybe the above was meant to be 'digital images?'

@@ -122,7 +122,7 @@ import numpy as np # form 4, load all of numpy into an object called

## Further Explanation

In the example above, form 1 loads the entire `skimage` library into the
In the example above, form 1 loads the entire scikit-image library into the
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here I would leave skimage because we are referring to code. We are actually importing Python modules, which must have all-lowercase names...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type:formatting Formatting needs to be fixed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants