Make it easier to use a venv

ankitects · Jun 21, 2022 · 57769a9 · 57769a9
1 parent 2780dfb
commit 57769a9
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -65,3 +65,6 @@ AnkiDroid/ACRA-INSTALLATION
 .DS_Store
 .externalNativeBuild
 .cxx
+
+# optional symlink to venv
+python
diff --git a/docs/easy-testing.md b/docs/easy-testing.md
@@ -31,18 +31,11 @@ Install Python packages
 ## Using a custom python venv
 
 If you don't want to `pip install protobuf` globally, you can
-switch to a venv:
-
-```diff
-diff --git a/tools/protoc-gen/protoc-gen.sh b/tools/protoc-gen/protoc-gen.sh
-index d4039ec..3ac5d29 100755
---- a/tools/protoc-gen/protoc-gen.sh
-+++ b/tools/protoc-gen/protoc-gen.sh
-@@ -1,2 +1,3 @@
- #!/bin/bash
--./tools/protoc-gen/protoc-gen.py
-+
-+$HOME/Local/python/misc/bin/python3 ./tools/protoc-gen/protoc-gen.py
+symlink the python bin from a venv into `python` at the top of
+the project folder:
+
+```
+$ ln -sf /path/to/venv/bin/python python
 ```
 
 ## Build

diff --git a/rslib-bridge/anki b/rslib-bridge/anki
diff --git a/tools/genfluent/genfluent.sh b/tools/genfluent/genfluent.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 
-./tools/genfluent/genfluent.py
+. tools/setup-python
+$PYTHON ./tools/genfluent/genfluent.py
diff --git a/tools/protoc-gen/protoc-gen.sh b/tools/protoc-gen/protoc-gen.sh
@@ -1,2 +1,4 @@
 #!/bin/bash
-./tools/protoc-gen/protoc-gen.py
+
+. tools/setup-python
+$PYTHON ./tools/protoc-gen/protoc-gen.py
diff --git a/tools/setup-python b/tools/setup-python
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+# If `python` in the project folder exists, use it instead of the global python.
+#
+
+if [ -e python ]; then
+  PYTHON=$(readlink $(pwd)/python)
+else
+  PYTHON=$(which python3)
+fi
+
+34 −0		.github/workflows/anki_artifacts.yml
+15 −0		tools/build-ankidroid-artifacts.sh