-
Notifications
You must be signed in to change notification settings - Fork 635
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
Fix 0.5 release branch + fixes to dist #2299
Fix 0.5 release branch + fixes to dist #2299
Conversation
Codecov Report
@@ Coverage Diff @@
## release-v0.5.x #2299 +/- ##
==================================================
- Coverage 79.17% 76.85% -2.32%
==================================================
Files 173 155 -18
Lines 7764 5760 -2004
Branches 1163 696 -467
==================================================
- Hits 6147 4427 -1720
+ Misses 1459 1196 -263
+ Partials 158 137 -21
Continue to review full report at Codecov.
|
Unexpected bumps while building the Debian package, not at all intentional changes here - or now they are :) |
31da0c4
to
5b24eec
Compare
…hows warning b4 uploading)
It might be easier to just target this to develop, 0.7 - the initial public release. I don't believe there's a need to make old releases available as debian packages? |
actually - did we need deb for 0.6 @jamalex ? |
ed9aedb
to
1fd6d4a
Compare
If the 0.5 branch is still relevant to someone and has to be supported, I would merge this because of the fixes stated in the description. Otherwise someone would have to fix it at a later time, anyways. |
This is ready now, please see the above description. |
Would you mind providing some notes on how to test this? We can give it a go and get it merged in.
It's not harmful to merge in, but we don't have any plans to release another version of 0.5 so this won't impact any users. (This PR has conflicts with 0.6 and develop, which is why I was suggesting it would be easier to skip 0.5) |
Conflicts you say? It's confusing that |
Hmm, not sure how to test it as such - it's more I think a code review thing. Maybe if it's verified that the artifacts from Buildkite are okay, then it's easy to say that the critical setup.py changes are okay? .deb builds are okay! I can get this merged into the other branches after it lands in 0.5.0 - btw that's our current 'stable' release which is why I built the .debs for it, don't know if I ever mentioned that!! :) |
nope - 0.6 is fully up-to-date with the current state of 0.5. There are just a couple minor conflicts with this PR, particularly with this line: https://github.com/learningequality/kolibri/blob/release-v0.6.x/Makefile#L68 |
I dare merge this now. I've added a changelog entry as an unreleased '0.5.1dev'. The rationale would be the following:
Once 0.5.1 is released, we will have to sync branches again, and the changelog will have a version bump - but this part shouldn't give any merge conflicts, as the 0.5.1dev entry is already there. |
Have tested the .pex and it works fine. Looking at file sizes, it doesn't seem like we have any problems with missing dependencies, neither.. all sizes remain intact. The Android APK is now 38 MB (before: 21 MB), but guessing the build is very different now @christianmemije ? |
Summary
setup_requires
(required for Debian builds, and YAGNI)Regarding the BIG WOOPS: This affects everything shipped so far. We have dependencies bundled AND specify them so they get pip installed, too.
pytest-runner allows us to do
setup.py test
such that it invokes pytest - however, we haven't fixed our sources to actually work without tox.ini, so only tox invocation works currently, anyways.The problem with
setup-requires
is that it breaks default Debian building, and potentially other ways of building too (Debian's pybuild blocks requesting URLs for dependencies while building)I've started building Debian packages in 0.5.0, which is why I'm lobbying for this change - but there's also a broken pre-commit hook, which is nicely dealt with.
I suppose we still intend to sync branches like release-v0.5.x into release-v0.6.x