Merging updates by ITACAInnovation · Pull Request #1804 · adafruit/circuitpython · GitHub
Skip to content

Merging updates#1804

Merged
tannewt merged 3 commits into
adafruit:masterfrom
ITACAInnovation:master
Apr 16, 2019
Merged

Merging updates#1804
tannewt merged 3 commits into
adafruit:masterfrom
ITACAInnovation:master

Conversation

@ITACAInnovation

Copy link
Copy Markdown

This pull request is for merging updates to the main branch.
Main updates PID and pinout.

ITACAInnovation and others added 3 commits April 16, 2019 16:45
Changed VID & PID to new ones.
Changed the layout accordingly to the prototype version.
@tannewt

tannewt commented Apr 16, 2019

Copy link
Copy Markdown
Member

@ITACAInnovation

Copy link
Copy Markdown
Author

@ITACAInnovation I've merged the latest changes from adafruit/master for you. Please start your changes from the latest commit to reduce merge conflicts. We have a git and GitHub guide here: https://learn.adafruit.com/contribute-to-circuitpython-with-git-and-github

Thanks

@tannewt

tannewt commented Apr 16, 2019

Copy link
Copy Markdown
Member

@tannewt tannewt reopened this Apr 16, 2019

@tannewt tannewt left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good! Thank you for the updates. They'll be in the next release.

@tannewt tannewt merged commit 608bf50 into adafruit:master Apr 16, 2019
jepler pushed a commit to jepler/circuitpython that referenced this pull request Jan 10, 2022
This changes makemanifest.py & mpy-tool.py to merge string and mpy names
into the same list (now mp_frozen_names).

The various paths for loading a frozen module (mp_find_frozen_module) and
checking existence of a frozen module (mp_frozen_stat) use a common
function that searches this list.

In addition, the frozen lookup will now only take place if the path starts
with ".frozen", which needs to be added to sys.path.

This fixes issues adafruit#1804, adafruit#2322, adafruit#3509, adafruit#6419.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
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.

2 participants