Skip to content

Commit

Permalink
recipe: introduce PyProjectRecipe and MesonRecipe (to update `pan…
Browse files Browse the repository at this point in the history
…das`, `numpy` and other recipes) (#3007)
  • Loading branch information
T-Dynamos authored May 9, 2024
1 parent 33e1b46 commit 87a32be
Show file tree
Hide file tree
Showing 21 changed files with 376 additions and 297 deletions.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ RUN ${RETRY} apt -y update -qq > /dev/null \
ant \
autoconf \
automake \
autopoint \
ccache \
cmake \
g++ \
Expand All @@ -70,6 +71,7 @@ RUN ${RETRY} apt -y update -qq > /dev/null \
make \
openjdk-17-jdk \
patch \
patchelf \
pkg-config \
python3 \
python3-dev \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ testapps-with-scipy/%: virtualenv
. $(ACTIVATE) && cd testapps/on_device_unit_tests/ && \
export LEGACY_NDK=$(ANDROID_NDK_HOME_LEGACY) && \
python setup.py $(ARTIFACT) --$(MODE) --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
--requirements python3,scipy,kivy \
--requirements python3,scipy,kivy \
--arch=armeabi-v7a --arch=arm64-v8a

testapps-webview: testapps-webview/debug/apk testapps-webview/release/aab
Expand Down
2 changes: 2 additions & 0 deletions doc/source/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ the following command (re-adapted from the `Dockerfile` we use to perform CI bui
ant \
autoconf \
automake \
autopoint \
ccache \
cmake \
g++ \
Expand All @@ -85,6 +86,7 @@ the following command (re-adapted from the `Dockerfile` we use to perform CI bui
make \
openjdk-17-jdk \
patch \
patchelf \
pkg-config \
python3 \
python3-dev \
Expand Down
Loading

2 comments on commit 87a32be

@Shayan-H20
Copy link

Choose a reason for hiding this comment

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

After this commit and upon changing the .minapi to 24 I am getting an error related to the math module:
"ModuleNotFoundError: No module named 'math'"

I see that you have a comment in the code:
"# NumPy requires complex math functions which were added in api 24"

I am unsure how to fix this import issue as math is inbuilt into Python, have you had the same error also?

@T-Dynamos
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@Shayan-H20 Please open a new issue, It works fine for me. (also github action apk was working fine)

Please sign in to comment.