Skip to content

Fix minor errors in docs #91

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Aug 23, 2023
Merged

Fix minor errors in docs #91

merged 2 commits into from
Aug 23, 2023

Conversation

rhooper
Copy link
Contributor

@rhooper rhooper commented Jul 9, 2023

Fixes docs:

  • Serpentine => serpentine
  • tiles_rows => tile_rows

@rhooper
Fix minor errors in docs
80a5662 
Fixes docs:
Serpentine => serpentine
tiles_rows =>  tile_rows
dhalbert
dhalbert requested changes Jul 9, 2023
View reviewed changes
@rhooper @dhalbert
Update adafruit_matrixportal/matrixportal.py
339d324 
Co-authored-by: Dan Halbert <halbert@halwitz.org>
@dhalbert
Copy link
Contributor

Something is busted about the build -- not sure what the problem is, since your change was so innocuous.

@dhalbert
Copy link
Contributor

@makermelissa Do you understand why the build is failing?

@FoamyGuy
Copy link
Contributor

@dhalbert and @makermelissa

It appears there has been a recent new major release for pillow

And amongst the release notes it lists this:

Remove deprecated ImageFont.getsize and related functions for Pillow 10.0.0 python-pillow/Pillow#7080 [@radarhere]

In Blinka_Displayio it's attempting to use the getsize() function here: https://github.com/adafruit/Adafruit_Blinka_Displayio/blob/61102c93bfb90fbccc4bc21122444531ebe2dd84/fontio.py#L78

I'm not entirely sure why it manifested itself in this particular way on this PR, but I think the options to resolve it for now are:

  • pin pillow to a lower release version number
  • Change fontio.py in Blinka_Displayio to use a different non-deprecated API, hopefully the functionality has just moved elsewhere and not been removed entirely.

@FoamyGuy FoamyGuy mentioned this pull request Jul 10, 2023
Merged
@radarhere
Copy link

radarhere commented Jul 10, 2023 •
edited
Loading

Hi.

Change fontio.py in Blinka_Displayio to use a different non-deprecated API, hopefully the functionality has just moved elsewhere and not been removed entirely.

You can read at https://pillow.readthedocs.io/en/stable/releasenotes/10.0.0.html#font-size-and-offset-methods that ImageFont.getsize() has been replaced by ImageFont.getbbox()

Edit: I now see this has been done at adafruit/Adafruit_Blinka_Displayio#108

@FoamyGuy
Copy link
Contributor

Thank you. Sorry to ping you, I didn't think to pull the "@" out of the line I copied from the release notes.

@makermelissa
Copy link
Collaborator

I'm not entirely sure why it manifested itself in this particular way on this PR, but I think the options to resolve it for now are:

  • pin pillow to a lower release version number
  • Change fontio.py in Blinka_Displayio to use a different non-deprecated API, hopefully the functionality has just moved elsewhere and not been removed entirely.

I'm fairly sure it installs Blinka Displayio unless you add displayio to autodoc_mock_imports in https://github.com/adafruit/Adafruit_CircuitPython_MatrixPortal/blob/main/docs/conf.py, so that's another possible fix. However, I think fixing it it in Blinka_Displayio would be the preferred fix.

@makermelissa
Copy link
Collaborator

@dhalbert the build is now passing if you want to approve unless you had some other requested changes.

FoamyGuy
FoamyGuy approved these changes Aug 23, 2023
View reviewed changes
Copy link
Contributor

@FoamyGuy FoamyGuy left a comment

Choose a reason for hiding this comment

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

This looks good to me.

we can always use a new PR if there are any further changes that come up.

@FoamyGuy FoamyGuy merged commit 817d563 into adafruit:main Aug 23, 2023
adafruit-adabot added a commit to adafruit/Adafruit_CircuitPython_Bundle that referenced this pull request Aug 29, 2023
@adafruit-adabot
Automated update by Adabot (adafruit/adabot@63c51c1)
0d5ff83 
Updating https://github.com/adafruit/Adafruit_CircuitPython_LIS3DH to 5.2.0 from 5.1.23:
  > Merge pull request adafruit/Adafruit_CircuitPython_LIS3DH#79 from perja12/perja/internal_pull_up

Updating https://github.com/adafruit/Adafruit_CircuitPython_TCA8418 to 1.0.8 from 1.0.7:
  > Merge pull request adafruit/Adafruit_CircuitPython_TCA8418#12 from adam-huganir/docs-fix-tutorial-link-update

Updating https://github.com/adafruit/Adafruit_CircuitPython_MatrixPortal to 3.1.11 from 3.1.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_MatrixPortal#92 from FoamyGuy/docs_fix
  > Merge pull request adafruit/Adafruit_CircuitPython_MatrixPortal#91 from rhooper/main

Updating https://github.com/adafruit/Adafruit_CircuitPython_Bundle/circuitpython_library_list.md to NA from NA:
  > Updated download stats for the libraries
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dhalbert dhalbert dhalbert requested changes

@FoamyGuy FoamyGuy FoamyGuy approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rhooper @dhalbert @FoamyGuy @radarhere @makermelissa