Skip to content

Remove superfluous recipes fixes #1387#2202

Merged
AndreMiras merged 1 commit intokivy:developfrom
AndreMiras:remove-superfluous-recipes
May 16, 2020
Merged

Remove superfluous recipes fixes #1387#2202
AndreMiras merged 1 commit intokivy:developfrom
AndreMiras:remove-superfluous-recipes

Conversation

@AndreMiras
Copy link
Member

@AndreMiras AndreMiras commented May 16, 2020

Merges/squash #1983
with a rebasing on develop, closes #1983

@AndreMiras
Copy link
Member Author

AndreMiras commented May 16, 2020

I've tested on an app that requires few of the dropped recipes. Things worked OK.
One build failed, but I think it's just a connectivity issue:

            > Could not GET 'https://dl.google.com/dl/android/maven2/net/sf/proguard/proguard-gradle/5.3.3/proguard-gradle-5.3.3.pom'.
               > Read timed out

@AndreMiras AndreMiras requested a review from opacam May 16, 2020 17:30
opacam
opacam reviewed May 16, 2020
View reviewed changes
pythonforandroid/recipes/greenlet/__init__.py
Comment on lines -1 to -11
from pythonforandroid.recipe import CompiledComponentsPythonRecipe


class GreenletRecipe(CompiledComponentsPythonRecipe):
version = '0.4.15'
url = 'https://pypi.python.org/packages/source/g/greenlet/greenlet-{version}.tar.gz'
depends = ['setuptools']
call_hostpython_via_targetpython = False


recipe = GreenletRecipe()
Copy link
Member

@opacam opacam May 16, 2020

Choose a reason for hiding this comment

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

I think that this recipe shouldn't be removed, since it compiles a library which will link to the wrong system libraries, for instance, if we inspect the library generated for an app built without this recipe:

opacam@DEPOBOX:/media/DEVEL/Android/python-for-android/dists/bdist_unit_tests_app__arm64-v8a/_python_bundle/_python_bundle/site-packages$ readelf -d greenlet.so

La section dynamique à l'offset 0x6020 contient 25 entrées :
  Seny       Tipus                        Nom/Valor
 0x0000000000000001 (NEEDED)             Biblioteca compartida: [libpthread.so.0]
 0x0000000000000001 (NEEDED)             Biblioteca compartida: [libc.so.6]
...

As you see, it will depend of system versioned libraries...I don't think that it will work on android...right?

Copy link
Member Author

@AndreMiras AndreMiras May 16, 2020

Choose a reason for hiding this comment

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

Good catch! I've reverted that one.
Funny to see your system is a mix of french and Spanish by the way 😄

Copy link
Member

@opacam opacam May 16, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Hahaha, my system doesn't fully translate to Catalan in my terminal and mix english, french and spanish 😆

@rnixx @AndreMiras
Remove superfluous recipes fixes kivy#1387
8620562 
Merges/squash kivy#1983
with a rebasing on develop, closes kivy#1983
@AndreMiras AndreMiras force-pushed the remove-superfluous-recipes branch from 3a3e46f to 8620562 Compare May 16, 2020 19:42
opacam
opacam approved these changes May 16, 2020
View reviewed changes
Copy link
Member

@opacam opacam left a comment

Choose a reason for hiding this comment

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

🔥 Nice clean up!!

@rnixx and @AndreMiras, ¡¡Thanks!!

@AndreMiras AndreMiras merged commit e4404c8 into kivy:develop May 16, 2020
@AndreMiras AndreMiras deleted the remove-superfluous-recipes branch May 16, 2020 20:08
AndreMiras added a commit to AndreMiras/python-for-android that referenced this pull request May 30, 2020
@AndreMiras
🐛 Adds missing explicit urllib3 sub dependency
7740a24 
The `requests` module has `urllib3` as dependency.
This used to be handled dynamically thanks to the `requests` recipe.
This is a drawback and side effect of kivy#2202.
The on device error was:
```
Imported unittest
loading tests...
running unittest...
unittest result is:
....EE........
======================================================================
ERROR: test_import_module (tests.test_requirements.RequestsTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/user/app/testapps/on_device_unit_tests/build/bdist.android-armeabi-v7a/test_app/tests/mixin.py", line 17, in test_import_module
  File "/home/user/.local/share/python-for-android/build/other_builds/python3/armeabi-v7a__ndk_target_21/python3/Lib/importlib/__init__.py", line 127, in import_module
  File "<frozen importlib._bootstrap>", line 1014, in _gcd_import
  File "<frozen importlib._bootstrap>", line 991, in _find_and_load
  File "<frozen importlib._bootstrap>", line 975, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 671, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 783, in exec_module
  File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
  File "/home/user/.local/share/python-for-android/build/python-installs/bdist_unit_tests_app/requests/__init__.py", line 43, in <module>
ModuleNotFoundError: No module named 'urllib3'

======================================================================
ERROR: test_run_module (tests.test_requirements.RequestsTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/user/app/testapps/on_device_unit_tests/build/bdist.android-armeabi-v7a/test_app/tests/test_requirements.py", line 74, in test_run_module
  File "/home/user/.local/share/python-for-android/build/python-installs/bdist_unit_tests_app/requests/__init__.py", line 43, in <module>
ModuleNotFoundError: No module named 'urllib3'

----------------------------------------------------------------------
Ran 14 tests in 0.591s

FAILED (errors=2)

Ran tests
```
AndreMiras added a commit to AndreMiras/python-for-android that referenced this pull request May 30, 2020
@AndreMiras
🐛 Adds missing explicit urllib3 sub dependency
8849ca0 
The `requests` module has `urllib3` and `chardet` as dependencies.
This used to be handled dynamically thanks to the `requests` recipe.
This is a drawback and side effect of kivy#2202.
The on device error was:
```
Imported unittest
loading tests...
running unittest...
unittest result is:
....EE........
======================================================================
ERROR: test_import_module (tests.test_requirements.RequestsTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/user/app/testapps/on_device_unit_tests/build/bdist.android-armeabi-v7a/test_app/tests/mixin.py", line 17, in test_import_module
  File "/home/user/.local/share/python-for-android/build/other_builds/python3/armeabi-v7a__ndk_target_21/python3/Lib/importlib/__init__.py", line 127, in import_module
  File "<frozen importlib._bootstrap>", line 1014, in _gcd_import
  File "<frozen importlib._bootstrap>", line 991, in _find_and_load
  File "<frozen importlib._bootstrap>", line 975, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 671, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 783, in exec_module
  File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
  File "/home/user/.local/share/python-for-android/build/python-installs/bdist_unit_tests_app/requests/__init__.py", line 43, in <module>
ModuleNotFoundError: No module named 'urllib3'

======================================================================
ERROR: test_run_module (tests.test_requirements.RequestsTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/user/app/testapps/on_device_unit_tests/build/bdist.android-armeabi-v7a/test_app/tests/test_requirements.py", line 74, in test_run_module
  File "/home/user/.local/share/python-for-android/build/python-installs/bdist_unit_tests_app/requests/__init__.py", line 43, in <module>
ModuleNotFoundError: No module named 'urllib3'

----------------------------------------------------------------------
Ran 14 tests in 0.591s

FAILED (errors=2)

Ran tests
```
AndreMiras added a commit to AndreMiras/python-for-android that referenced this pull request May 30, 2020
@AndreMiras
🐛 Adds missing requests sub dependencies
b99eee1 
The `requests` module has `urllib3` and `chardet` as dependencies.
This used to be handled dynamically thanks to the `requests` recipe.
This is a drawback and side effect of kivy#2202.
The on device error was:
```
Imported unittest
loading tests...
running unittest...
unittest result is:
....EE........
======================================================================
ERROR: test_import_module (tests.test_requirements.RequestsTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/user/app/testapps/on_device_unit_tests/build/bdist.android-armeabi-v7a/test_app/tests/mixin.py", line 17, in test_import_module
  File "/home/user/.local/share/python-for-android/build/other_builds/python3/armeabi-v7a__ndk_target_21/python3/Lib/importlib/__init__.py", line 127, in import_module
  File "<frozen importlib._bootstrap>", line 1014, in _gcd_import
  File "<frozen importlib._bootstrap>", line 991, in _find_and_load
  File "<frozen importlib._bootstrap>", line 975, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 671, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 783, in exec_module
  File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
  File "/home/user/.local/share/python-for-android/build/python-installs/bdist_unit_tests_app/requests/__init__.py", line 43, in <module>
ModuleNotFoundError: No module named 'urllib3'

======================================================================
ERROR: test_run_module (tests.test_requirements.RequestsTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/user/app/testapps/on_device_unit_tests/build/bdist.android-armeabi-v7a/test_app/tests/test_requirements.py", line 74, in test_run_module
  File "/home/user/.local/share/python-for-android/build/python-installs/bdist_unit_tests_app/requests/__init__.py", line 43, in <module>
ModuleNotFoundError: No module named 'urllib3'

----------------------------------------------------------------------
Ran 14 tests in 0.591s

FAILED (errors=2)

Ran tests
```
AndreMiras added a commit to AndreMiras/python-for-android that referenced this pull request May 30, 2020
@AndreMiras
🐛 Adds missing requests sub dependencies
54a62d5 
The `requests` module has `urllib3`, `chardet` and `idna` as dependencies.
This used to be handled dynamically thanks to the `requests` recipe.
This is a drawback and side effect of kivy#2202.
The on device error was:
```
Imported unittest
loading tests...
running unittest...
unittest result is:
....EE........
======================================================================
ERROR: test_import_module (tests.test_requirements.RequestsTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/user/app/testapps/on_device_unit_tests/build/bdist.android-armeabi-v7a/test_app/tests/mixin.py", line 17, in test_import_module
  File "/home/user/.local/share/python-for-android/build/other_builds/python3/armeabi-v7a__ndk_target_21/python3/Lib/importlib/__init__.py", line 127, in import_module
  File "<frozen importlib._bootstrap>", line 1014, in _gcd_import
  File "<frozen importlib._bootstrap>", line 991, in _find_and_load
  File "<frozen importlib._bootstrap>", line 975, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 671, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 783, in exec_module
  File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
  File "/home/user/.local/share/python-for-android/build/python-installs/bdist_unit_tests_app/requests/__init__.py", line 43, in <module>
ModuleNotFoundError: No module named 'urllib3'

======================================================================
ERROR: test_run_module (tests.test_requirements.RequestsTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/user/app/testapps/on_device_unit_tests/build/bdist.android-armeabi-v7a/test_app/tests/test_requirements.py", line 74, in test_run_module
  File "/home/user/.local/share/python-for-android/build/python-installs/bdist_unit_tests_app/requests/__init__.py", line 43, in <module>
ModuleNotFoundError: No module named 'urllib3'

----------------------------------------------------------------------
Ran 14 tests in 0.591s

FAILED (errors=2)

Ran tests
```
@AndreMiras AndreMiras mentioned this pull request May 31, 2020
Merged
AndreMiras added a commit to AndreMiras/python-for-android that referenced this pull request May 31, 2020
@AndreMiras
🐛 Adds missing requests sub dependencies
da6ae48 
The `requests` module has `urllib3`, `chardet` and `idna` as dependencies.
This used to be handled dynamically thanks to the `requests` recipe.
This is a drawback and side effect of kivy#2202.
The on device error was:
```
Imported unittest
loading tests...
running unittest...
unittest result is:
....EE........
======================================================================
ERROR: test_import_module (tests.test_requirements.RequestsTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/user/app/testapps/on_device_unit_tests/build/bdist.android-armeabi-v7a/test_app/tests/mixin.py", line 17, in test_import_module
  File "/home/user/.local/share/python-for-android/build/other_builds/python3/armeabi-v7a__ndk_target_21/python3/Lib/importlib/__init__.py", line 127, in import_module
  File "<frozen importlib._bootstrap>", line 1014, in _gcd_import
  File "<frozen importlib._bootstrap>", line 991, in _find_and_load
  File "<frozen importlib._bootstrap>", line 975, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 671, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 783, in exec_module
  File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
  File "/home/user/.local/share/python-for-android/build/python-installs/bdist_unit_tests_app/requests/__init__.py", line 43, in <module>
ModuleNotFoundError: No module named 'urllib3'

======================================================================
ERROR: test_run_module (tests.test_requirements.RequestsTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/user/app/testapps/on_device_unit_tests/build/bdist.android-armeabi-v7a/test_app/tests/test_requirements.py", line 74, in test_run_module
  File "/home/user/.local/share/python-for-android/build/python-installs/bdist_unit_tests_app/requests/__init__.py", line 43, in <module>
ModuleNotFoundError: No module named 'urllib3'

----------------------------------------------------------------------
Ran 14 tests in 0.591s

FAILED (errors=2)

Ran tests
```
Also sneaked a minor documentation regression fix (bug introduced in kivy#2219).
AndreMiras added a commit to AndreMiras/python-for-android that referenced this pull request Jun 2, 2020
@AndreMiras
🐛 Adds missing requests sub dependencies
f5e0855 
The `requests` module has `urllib3`, `chardet` and `idna` as dependencies.
This used to be handled dynamically thanks to the `requests` recipe.
This is a drawback and side effect of kivy#2202.
The on device error was:
```
Imported unittest
loading tests...
running unittest...
unittest result is:
....EE........
======================================================================
ERROR: test_import_module (tests.test_requirements.RequestsTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/user/app/testapps/on_device_unit_tests/build/bdist.android-armeabi-v7a/test_app/tests/mixin.py", line 17, in test_import_module
  File "/home/user/.local/share/python-for-android/build/other_builds/python3/armeabi-v7a__ndk_target_21/python3/Lib/importlib/__init__.py", line 127, in import_module
  File "<frozen importlib._bootstrap>", line 1014, in _gcd_import
  File "<frozen importlib._bootstrap>", line 991, in _find_and_load
  File "<frozen importlib._bootstrap>", line 975, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 671, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 783, in exec_module
  File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
  File "/home/user/.local/share/python-for-android/build/python-installs/bdist_unit_tests_app/requests/__init__.py", line 43, in <module>
ModuleNotFoundError: No module named 'urllib3'

======================================================================
ERROR: test_run_module (tests.test_requirements.RequestsTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/user/app/testapps/on_device_unit_tests/build/bdist.android-armeabi-v7a/test_app/tests/test_requirements.py", line 74, in test_run_module
  File "/home/user/.local/share/python-for-android/build/python-installs/bdist_unit_tests_app/requests/__init__.py", line 43, in <module>
ModuleNotFoundError: No module named 'urllib3'

----------------------------------------------------------------------
Ran 14 tests in 0.591s

FAILED (errors=2)

Ran tests
```
Also sneaked a minor documentation regression fix (bug introduced in kivy#2219).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@opacam opacam opacam approved these changes

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

@AndreMiras @opacam @rnixx