From 45900e3f2472ad3fd13386956c09d83368d305c3 Mon Sep 17 00:00:00 2001 From: Paul Guyot Date: Wed, 1 May 2024 22:09:04 +0200 Subject: [PATCH] Fix CI by updating kaldi binary, install script and snips-nlu-parsers Also set CI image to 22.04 instead of latest. Also remove setup rust as rust is bundled (and more up to date) Signed-off-by: Paul Guyot --- .github/workflows/tests.yml | 11 +++-------- requirements.txt | 4 ++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 21f2560a..acbeb582 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,7 @@ on: jobs: test_suite: name: Run test suite - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 # Service containers services: postgres: @@ -40,18 +40,13 @@ jobs: with: python-version: ${{ matrix.python }} - - name: Set up Rust - uses: hecrj/setup-rust-action@v1 - with: - rust-version: 1.61.0 - - name: Install dependencies run: | sudo apt update -y sudo apt-get install -y libasound2-dev libmpg123-dev libatlas-base-dev curl - wget -q -O install_mkl.sh https://raw.githubusercontent.com/pguyot/kaldi/e4940d045d39deb86016bc176893303b5240ff59/tools/extras/install_mkl.sh + wget -q -O install_mkl.sh https://raw.githubusercontent.com/kaldi-asr/kaldi/aef1d98603b68e6cf3a973e9dcd71915e2a175fe/tools/extras/install_mkl.sh sudo bash install_mkl.sh - wget -q -O - "https://github.com/pguyot/kaldi/releases/download/e4940d045/kaldi-e4940d045-linux_ubuntu20.04-x86_64.tar.xz" | sudo tar xJ -C / + wget -q -O - "https://github.com/pguyot/kaldi/releases/download/0ff452b/kaldi-0ff452b-linux_ubuntu22.04-x86_64.tar.xz" | sudo tar xJ -C / sudo ldconfig python -m pip install --upgrade pip pip install Cython==0.29.30 numpy==1.21.4 setuptools_rust wheel diff --git a/requirements.txt b/requirements.txt index 0cbc276f..8a52237f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -41,14 +41,14 @@ https://github.com/pguyot/snips-nlu-parsers/releases/download/v0.4.3/snips_nlu_p https://github.com/pguyot/snips-nlu-parsers/releases/download/v0.4.3/snips_nlu_parsers-0.4.3-cp37-cp37m-linux_armv7l.whl; sys_platform == 'linux' and 'armv7l' in platform_machine and python_version == '3.7' https://github.com/pguyot/snips-nlu-parsers/releases/download/v0.4.3/snips_nlu_parsers-0.4.3-cp39-cp39-linux_armv7l.whl; sys_platform == 'linux' and 'armv7l' in platform_machine and python_version == '3.9' https://github.com/pguyot/snips-nlu-parsers/releases/download/v0.4.3/snips_nlu_parsers-0.4.3-cp39-cp39-linux_aarch64.whl; sys_platform == 'linux' and 'aarch64' in platform_machine and python_version == '3.9' -snips-nlu-parsers==0.4.3; sys_platform != 'linux' or ('armv6l' not in platform_machine and 'armv7l' not in platform_machine) or (python_version != '3.7' and python_version != '3.9') +git+https://github.com/pguyot/snips-nlu-parsers@0.4.3-2024#subdirectory=python; sys_platform != 'linux' or ('armv6l' not in platform_machine and 'armv7l' not in platform_machine and 'aarch64' not in platform_machine) or (python_version != '3.7' and python_version != '3.9') https://github.com/pguyot/snips-nlu-utils/releases/download/v0.9.1/snips_nlu_utils-0.9.1-cp37-cp37m-linux_armv6l.whl; sys_platform == 'linux' and 'armv6l' in platform_machine and python_version == '3.7' https://github.com/pguyot/snips-nlu-utils/releases/download/v0.9.1/snips_nlu_utils-0.9.1-cp39-cp39-linux_armv6l.whl; sys_platform == 'linux' and 'armv6l' in platform_machine and python_version == '3.9' https://github.com/pguyot/snips-nlu-utils/releases/download/v0.9.1/snips_nlu_utils-0.9.1-cp37-cp37m-linux_armv7l.whl; sys_platform == 'linux' and 'armv7l' in platform_machine and python_version == '3.7' https://github.com/pguyot/snips-nlu-utils/releases/download/v0.9.1/snips_nlu_utils-0.9.1-cp39-cp39-linux_armv7l.whl; sys_platform == 'linux' and 'armv7l' in platform_machine and python_version == '3.9' https://github.com/pguyot/snips-nlu-utils/releases/download/v0.9.1/snips_nlu_utils-0.9.1-cp39-cp39-linux_aarch64.whl; sys_platform == 'linux' and 'aarch64' in platform_machine and python_version == '3.9' -snips-nlu-utils==0.9.1; sys_platform != 'linux' or ('armv6l' not in platform_machine and 'armv7l' not in platform_machine and 'aarch64' not in platform_machine) or (python_version != '3.7' and python_version != '3.9') +snips-nlu-utils==0.9.1; sys_platform != 'linux' or ('armv6l' not in platform_machine and 'armv7l' not in platform_machine and 'aarch64' not in platform_machine) or (python_version != '3.7' and python_version != '3.9') https://github.com/pguyot/pynfcdev/releases/download/v0.7.4/pynfcdev-0.7.4-py3-none-any.whl ndef==0.2