Skip to content

Update the pixel_shader usage of OnDiskBitmap #46

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

Merged
merged 2 commits into from
Jul 21, 2021

Conversation

lesamouraipourpre
Copy link
Contributor

OnDiskBitmap has had incompatible changes in 7.0.0-alpha.3 - Ref: adafruit/circuitpython#4823
This PR is part of a group of updates for this change - adafruit/circuitpython#4982

This PR updates the library to the combined usage for CP6 & CP7.

Also:
Refactor code referencing CircuitPython 4 & 5
Filled out requirements.txt
Include most of the packages in api.rst.
I can't get docs to build for cpb_gizmo so have left it out of the docs for now.

It has not been tested as I do not have the hardware. I tried testing with the PyPortal example but I am getting this bug (even before changes): adafruit/circuitpython#4985

Refactor code referencing CircuitPython 4 & 5
Filled out requirements.txt
Include most of the packages in api.rst.
I can't get docs to build for cpb_gizmo so have left it out of the docs for now.
Copy link
Contributor

@jepler jepler left a comment

Choose a reason for hiding this comment

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

This seems fine, but I don't know why CI/actions has been having trouble with it. No testing performed.

@lesamouraipourpre
Copy link
Contributor Author

I've tried pulling this PR into a clean directory and pip install -r requirements.txt is behaving like there is a clashing dependency graph. When it finishes locally, I'll try to figure out what the trigger dependency is.

@lesamouraipourpre
Copy link
Contributor Author

The problem is adafruit-circuitpython-gizmo. There are requirements changes in it that have been merged but not released - adafruit/Adafruit_CircuitPython_Gizmo@1.3.2...HEAD
I had the HEAD installed with pip install -e . instead of the PyPi version.

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.

I think the necessary changes in the Gizmo library have been released by now. I re-ran the actions and it is now passing.

These changes look good to me. I tested the simpletest script successfully on a PyGamer with 7.0.0-alpha.4

Thanks for these updates @lesamouraipourpre and for taking care of the old v4 / 5 fallback displayio code.

@FoamyGuy FoamyGuy merged commit 7449f56 into adafruit:main Jul 21, 2021
adafruit-adabot added a commit to adafruit/Adafruit_CircuitPython_Bundle that referenced this pull request Jul 22, 2021
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.

3 participants