Merged
Conversation
AndreMiras
previously approved these changes
Mar 28, 2020
Member
AndreMiras
left a comment
AndreMiras
left a comment
There was a problem hiding this comment.
I've been waiting for this for too long, maybe now it's time :)
Yes indeed rebuild_updated_recipes is expected to fail in this scenario
This was referenced Mar 28, 2020
`python2` it will not be a conflict anymore, since it doesn't exist.
This is strange...that recipe should be in a folder right?
Because we don't use it anymore. We used to package `python2` but our `python3` was never zipped with that function, so there is no point to maintain it now that we get rid of python2.
opacam
force-pushed
the
feature-drop-python2
branch
from
cfa0560 to
9dc78f9
Compare
This build was only there to check Python 2 support, so it's fine to skip it now.
I think being explicit is still best practice, correct me if I'm wrong. We don't really support calling this script directly any more anyway, but I guess may as well do it right!
inclement
approved these changes
Mar 30, 2020
Member
inclement
left a comment
inclement
left a comment
There was a problem hiding this comment.
Awesome, spring cleaning :p
Looks nice and clean to me. I made a few doc commits while I was going through, but I think nothing controversial, just trying to maintain a preferred style (like preferring "Python 3" to "Python3" in doc that doesn't refer to the recipe name). Let me know if you disagree with anything.
Other than that, as long as the tests still pass then looks good to me!
Member
Author
|
Thanks @inclement, all looks perfect to me, and thanks to directly make the corrections and the merging 😄 |
zworkb
pushed a commit
to zworkb/python-for-android
that referenced
this pull request
Apr 15, 2020
* 🔥 Remove `hostpython2` recipe * 🔥 Remove `python2` recipe * 🔥 Remove python2 related from `ci/constants` * 🔥 Remove python2 environ/tests from `tox` * 🔥 Remove python2 code from `PythonUtil.java` * 🔥 Remove python2 patch from `recipes/numpy` * 🔥 Remove python2 code from `ci/rebuild_updated_recipes` * 🔥 Remove `test_entrypoints_python2.py` * 🔥 Remove python2 code from `start.c` * 🔥 Remove python2 testapps * 🔥 Remove python2 code from `bs/common/build/build.py` * 🍱 Update shebang: from `python2` to `python` * 🍱 Update requirements for `testlauncher_setup` * 🔥 Remove python2 from class `Bootstrap.recipe_depends` * 🔥 Remove python2 code from `recipe.py` * 🔥 Remove `Dockerfile.py2` * 🍱 Update docstring example for `ToolchainCL.recipes` `python2` it will not be a conflict anymore, since it doesn't exist. * 🔥 Remove `note` about `python2` target * 🍱 Update `android` recipe to avoid `python2` * 🔥 Remove `python2` from recipes's `depends` * 🔥 Remove `hostpython2` from recipes's `depends` * 🔥 Remove `python2` from recipes's `conflicts` * 🍱 Change `hostpython2` to `hostpython3` for `mysqldb` recipe * 🔥 Remove python2 code from `python` module * ✅ Update tests to work without `python2` * 🍱 Update `ndghttpsclient` recipe? This is strange...that recipe should be in a folder right? * 🔥 Remove python2 tests from `Makefile`, `travis.yml` and `push.yml` * 🔥 Remove `make_python_zip` Because we don't use it anymore. We used to package `python2` but our `python3` was never zipped with that function, so there is no point to maintain it now that we get rid of python2. * 📝 Update docs * Clean up README for Python 2 changes * Update Python version support documentation * Removed Python 2 app build from release process This build was only there to check Python 2 support, so it's fine to skip it now. * Made note about python2 support more explicit * Changed a /usr/bin/env call to explicitly python3 I think being explicit is still best practice, correct me if I'm wrong. We don't really support calling this script directly any more anyway, but I guess may as well do it right! Co-authored-by: Alexander Taylor <alexanderjohntaylor@gmail.com>
AndreMiras
added a commit
to AndreMiras/python-for-android
that referenced
this pull request
Apr 18, 2020
Simplifies the Dockerfile as Python 2 was dropped. Renames to default "Dockerfile" so it's picked up by docker hub automatically. This is a follow-up for: kivy#2105 Adds the GitHub action build badge. Free up space before building the APKs to avoid the GitHub Action runner being full. The error was: ``` mkdir -p /home/user/.android/android-ndk-r19b \ && unzip -q android-ndk-r19b-linux-x86_64.zip -d /home/user/.android \ && ln -sfn /home/user/.android/android-ndk-r19b /home/user/.android/android-ndk \ && rm -f android-ndk-r19b-linux-x86_64.zip Error processing tar file(exit status 1): write /home/user/.android/android-ndk-r19b/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/lib/bfd-plugins/LLVMgold.so: no space left on device Makefile:61: recipe for target 'docker/build' failed make: *** [docker/build] Error 1 ```` https://github.com/kivy/python-for-android/actions/runs/81658805
AndreMiras
added a commit
to AndreMiras/python-for-android
that referenced
this pull request
Apr 18, 2020
Simplifies the Dockerfile as Python 2 was dropped. Renames to default "Dockerfile" so it's picked up by docker hub automatically. This is a follow-up for: kivy#2105 Adds the GitHub action build badge. Free up space before building the APKs to avoid the GitHub Action runner being full. The error was: ``` mkdir -p /home/user/.android/android-ndk-r19b \ && unzip -q android-ndk-r19b-linux-x86_64.zip -d /home/user/.android \ && ln -sfn /home/user/.android/android-ndk-r19b /home/user/.android/android-ndk \ && rm -f android-ndk-r19b-linux-x86_64.zip Error processing tar file(exit status 1): write /home/user/.android/android-ndk-r19b/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/lib/bfd-plugins/LLVMgold.so: no space left on device Makefile:61: recipe for target 'docker/build' failed make: *** [docker/build] Error 1 ```` https://github.com/kivy/python-for-android/actions/runs/81658805 The "Free disk space" step could clear about ~10G and helped making the build pass. See output logs for details.
AndreMiras
added a commit
to AndreMiras/python-for-android
that referenced
this pull request
Apr 18, 2020
Simplifies the Dockerfile as Python 2 was dropped. Renames to default "Dockerfile" so it's picked up by docker hub automatically. This is a follow-up for: kivy#2105 Adds the GitHub action build badge. Free up space before building the APKs to avoid the GitHub Action runner being full. The error was: ``` mkdir -p /home/user/.android/android-ndk-r19b \ && unzip -q android-ndk-r19b-linux-x86_64.zip -d /home/user/.android \ && ln -sfn /home/user/.android/android-ndk-r19b /home/user/.android/android-ndk \ && rm -f android-ndk-r19b-linux-x86_64.zip Error processing tar file(exit status 1): write /home/user/.android/android-ndk-r19b/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/lib/bfd-plugins/LLVMgold.so: no space left on device Makefile:61: recipe for target 'docker/build' failed make: *** [docker/build] Error 1 ```` https://github.com/kivy/python-for-android/actions/runs/81658805 The "Free disk space" step could clear about ~10G and helped making the build pass. See output logs for details.
AndreMiras
added a commit
to AndreMiras/python-for-android
that referenced
this pull request
Apr 18, 2020
Simplifies the Dockerfile as Python 2 was dropped. Renames to default "Dockerfile" so it's picked up by docker hub automatically. This is a follow-up for: kivy#2105 Adds the GitHub action build badge. Free up space before building the APKs to avoid the GitHub Action runner being full. The error was: ``` mkdir -p /home/user/.android/android-ndk-r19b \ && unzip -q android-ndk-r19b-linux-x86_64.zip -d /home/user/.android \ && ln -sfn /home/user/.android/android-ndk-r19b /home/user/.android/android-ndk \ && rm -f android-ndk-r19b-linux-x86_64.zip Error processing tar file(exit status 1): write /home/user/.android/android-ndk-r19b/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/lib/bfd-plugins/LLVMgold.so: no space left on device Makefile:61: recipe for target 'docker/build' failed make: *** [docker/build] Error 1 ```` https://github.com/kivy/python-for-android/actions/runs/81658805 The "Free disk space" step could clear about ~10G and helped making the build pass. See output logs for details.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In this PR, we drop support for Python 2...so no more
python2recipe.Quick view of what we do:
python2recipehostpython2recipeNotes
rebuild_updated_recipesCI test, since we have to touch a lot of recipes and some of them will create a dependencies conflict.