langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #611 from evandroforks/automatically_install_pyaudio_on_make_check

Browse Source 
Automatically install pyaudio when running make check
This commit is contained in:
Damien Elmes 2020-05-12 20:44:25 +10:00 committed by GitHub
commit 436bdd6970
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/checks.yml vendored
View File

@ -123,9 +123,6 @@ jobs:
echo "::set-env name=RSPY_TARGET_DIR::${GITHUB_WORKSPACE}/target" echo "::set-env name=RSPY_TARGET_DIR::${GITHUB_WORKSPACE}/target"
echo "::set-env name=CARGO_TARGET_DIR::${GITHUB_WORKSPACE}/target" echo "::set-env name=CARGO_TARGET_DIR::${GITHUB_WORKSPACE}/target"
# https://anki.tenderapp.com/discussions/add-ons/44009-problems-with-code-completion
echo "::set-env name=ANKI_EXTRA_PIP::python -m pip install pyaudio"
- name: Configure Mac OS environment variables - name: Configure Mac OS environment variables
if: matrix.os == 'macos-latest' if: matrix.os == 'macos-latest'
run: | run: |
@ -144,9 +141,6 @@ jobs:
# https://stackoverflow.com/questions/59644349/msgmerge-on-macos-catalina # https://stackoverflow.com/questions/59644349/msgmerge-on-macos-catalina
echo "::set-env name=PATH::/usr/local/opt/gettext/bin:$PATH" echo "::set-env name=PATH::/usr/local/opt/gettext/bin:$PATH"
# https://anki.tenderapp.com/discussions/add-ons/44009-problems-with-code-completion
echo "::set-env name=ANKI_EXTRA_PIP::python -m pip install pyaudio"
- name: Configure Windows environment variables - name: Configure Windows environment variables
if: matrix.os == 'windows-latest' if: matrix.os == 'windows-latest'
run: | run: |

3
Makefile
View File

@ -61,8 +61,7 @@ all: run
# - modern pip required for wheel # - modern pip required for wheel
# - add qt if missing # - add qt if missing
pyenv: pyenv:
# https://github.com/PyO3/maturin/issues/283 # https://github.com/PyO3/maturin/issues/283 - Expected `python` to be a python interpreter inside a virtualenv
# Expected `python` to be a python interpreter inside a virtualenv
set -eu -o pipefail ${SHELLFLAGS}; \ set -eu -o pipefail ${SHELLFLAGS}; \
"${PYTHON_BIN}" -m pip install virtualenv; \ "${PYTHON_BIN}" -m pip install virtualenv; \
"${PYTHON_BIN}" -m venv pyenv; \ "${PYTHON_BIN}" -m venv pyenv; \

6
qt/Makefile
View File

@ -70,7 +70,11 @@ BUILD_STEPS := .build/vernum .build/run-deps .build/dev-deps .build/js .build/ui
###################### ######################
.PHONY: check .PHONY: check
check: $(BUILD_STEPS) .build/mypy .build/test .build/fmt .build/imports .build/lint .build/ts-fmt check: pyaudio $(BUILD_STEPS) .build/mypy .build/test .build/fmt .build/imports .build/lint .build/ts-fmt
# https://github.com/ankitects/anki/pull/611 - Automatically install pyaudio when running make check
pyaudio:
python -m pip install pyaudio
.PHONY: fix .PHONY: fix
fix: $(BUILD_STEPS) fix: $(BUILD_STEPS)