Bump to SDL2 2.0.10 & extract .java from SDL2 tarball: merge conflicts fixed#2113
Conversation
|
If the tests pass, I intend to merge this right away. |
|
The flake 8 errors now are fixed by #2114, a new merge/rebase of develop branch should fix that |
AndreMiras
left a comment
There was a problem hiding this comment.
Yes 5K lines of code less 👏
Can we rebase it to see if tests are passing?
Can't wait to have it merged!
| if not os.path.exists(target_dir): | ||
| os.makedirs(target_dir) |
There was a problem hiding this comment.
We could save one line by simulating the --parents flag:
| if not os.path.exists(target_dir): | |
| os.makedirs(target_dir) | |
| os.makedirs(target_dir, exist_ok=True) |
There was a problem hiding this comment.
I think I wrote it like this to maintain Python 2 compatibility. So yes, for 3.x-only shortening it like this makes sense 👍
ffeb6e4 to
adf71a4
Compare
|
Unsurprisingly there are some minor test failures, but the app builds seem to work fine. I'll see if I can fix it quickly. I'm finding that test_pythonpackage.py runs out my ram within a few seconds, which didn't happen in the past. Not sure what's up there. |
|
I actually often skip the |
|
If I remember well...the problem of these tests are that we don't mock at all the file/dir reading/creation and this has a serious impact to the tests performance. So, as @AndreMiras, I almost always skip these tests as well. Anyway, I also tested one of the generated apks for |
|
For what it's worth, Edit: the out of memory thing sounds strange though. How much did it have available to run? |
adf71a4 to
4e733a6
Compare
|
Got sidetracked on this but still trying to prioritise it over anything else. I fixed a bug with the sdl2 patching, on runs after the first one it was partially-applying the patch before deciding the patch wasn't needed, breaking the java code. I've made it do a dry run instead, which seems to resolve that issue. I want to do a bit more testing, but as far as I know it's working fine now. |
Co-authored-by: Pol Canelles <canellestudi@gmail.com>
|
Fixed tox, I think, by fixing recipe cache clearing. |
|
Fixed another bug, in test_recipe.py. This one only occurs if you run the tests from an unexpected directory, as the test tries to listdir a directory that doesn't exist because the exists call has been overridden. To keep things simple, I changed the test state so that this directory is not in the search path, but I might revisit this in another PR. |
AndreMiras
left a comment
There was a problem hiding this comment.
Looking good! Thanks for spending time on resuming this work. Awesome to see 5K lines ditched 👏
Thank you @etc0de for the initial initiative ❤️
…s fixed (kivy#2113) * Bump to SDL2 2.0.10 & make sure to extract .java from SDL2 tarball * Made SDL2 patching do a dry run to check it will work * Update pythonforandroid/bootstraps/common/build/build.py Co-authored-by: Pol Canelles <canellestudi@gmail.com> * Made bootstrap tests clear the Recipe cache in setup * Made test_should_build not check non-existing storage_dir Authored-by: Jonas Thiem <jonas@thiem.email>
This is the code from #1779 with (minor) merge conflicts fixed.