8000 merge 4.1.x into 4.x by dhalbert · Pull Request #2401 · adafruit/circuitpython · GitHub
[go: up one dir, main page]
Skip to content

merge 4.1.x into 4.x #2401

New issue

Have a question about this project? Sign up for a free GitHub account to 8000 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 7 commits into from
Dec 17, 2019
Merged

merge 4.1.x into 4.x #2401

merged 7 commits into from
Dec 17, 2019

Conversation

dhalbert
Copy link
Collaborator

Let's use 4.x for bugfixes to version 4. There are fixes in 4.x that were not in 4.1.x and vice versa. I'll make another PR for the other way. We weren't consistent about which one we used. Or maybe get rid of the 4.{0,1}.x branches, since it's confusing?

tannewt and others added 7 commits August 29, 2019 10:34
@tannewt
Hallowing M4
84839de
@tannewt
add additional pin aliases
0aa5507
@tannewt
Merge pull request #2094 from tannewt/hallowing_m4
8d14266 
Add Hallowing M4 support
@jepler
nRF: PWMOut: At deinit, make pin available again
251c0f5 
Closes: #2146
@tannewt
Merge pull request #2153 from jepler/issue2146-4x
c8eee68 
nRF: PWMOut: At deinit, make pin available again
@jepler
preprocess_frozen_modules: exclude subdirs of examples, docs, tests
1719a14 
.. this reclaims several kB on CPX, where we really need it.
@dhalbert
Merge pull request #2398 from jepler/excluded-mpy-subdirs-4.x
8d43848 
preprocess_frozen_modules: exclude subdirs of examples, docs, tests
@dhalbert dhalbert requested review from tannewt and jepler December 17, 2019 18:18
@dhalbert dhalbert mentioned this pull request Dec 17, 2019
Closed
jepler
jepler approved these changes Dec 17, 2019
View reviewed changes
Copy link
@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.

The changes all look like sensible stuff. I can't speak to the question of how to manage the v4-ish branches but I could sure show up at a special in the weeds section to talk about it if that's helpful

@dhalbert dhalbert merged commit d4bb108 into 4.x Dec 17, 2019
@tannewt
Copy link
Member
tannewt commented Dec 17, 2019

I generally prefer 4.1.x and 4.x to be separate if 4.x work will end up as 4.2.0. In general, I'd prefer more specific branches like 4.1.x over more general ones.

@dhalbert dhalbert mentioned this pull request Dec 17, 2019
Closed
@dhalbert
Copy link
Collaborator Author

I generally prefer 4.1.x and 4.x to be separate if 4.x work will end up as 4.2.0. In general, I'd prefer more specific branches like 4.1.x over more general ones.

Sounds fine -- I have submitted a reverse PR to make the two branches identical. Do you feel that the CPX stack-size updates and the new frozen libs are 4.1.1 or 4.2.0? It is an API enhancement from the point of view of the CPX library, but nothing else. And boards other than CPX are not affected at all, so maybe 4.1.1?

< 8000 /include-fragment>
@tannewt
Copy link
Member
tannewt commented Dec 17, 2019

Either one works for me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jepler jepler jepler approved these changes

@tannewt tannewt Awaiting requested review from tannewt

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

Successfully merging this pull request may close these issues.
3 participants
@dhalbert @tannewt @jepler
0