From 4c3f60334424b34b6b49d76f2dbc728fe051fd03 Mon Sep 17 00:00:00 2001 From: Jo Booth Date: Thu, 12 Oct 2023 17:27:43 -0400 Subject: [PATCH 1/2] fix: LEAP-293: bump pillow version to respond to CVE-2023-4863 --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7e656949..dd1d9233 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,7 @@ pandas>=0.24.0 requests>=2.22.0,<3 -Pillow==9.3.0 +Pillow>=10.0.1 nltk==3.6.7 label-studio-tools>=0.0.3 ujson ijson~=3.2.0.post0 - From 743c27ca4f97ef149c10b30279eb37ddeed148e6 Mon Sep 17 00:00:00 2001 From: Jo Booth Date: Thu, 12 Oct 2023 17:36:32 -0400 Subject: [PATCH 2/2] bump test runner python version (we dont support 3.7 anyway) --- .github/workflows/tests.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 633e543b..0bcb05d8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -31,12 +31,12 @@ jobs: steps: - uses: actions/checkout@v4 - + - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.7' - + python-version: '3.8' + - uses: actions/cache@v3 name: Configure pip cache id: pip-cache @@ -45,21 +45,21 @@ jobs: key: ${{ env.CACHE_NAME_PREFIX }}-${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements-test.txt') }} restore-keys: | ${{ env.CACHE_NAME_PREFIX }}-${{ runner.os }}-pip- - + - name: Install dependencies run: | sudo apt-get clean sudo apt-get update sudo apt-get install virtualenv libsasl2-dev python3-dev libldap2-dev libssl-dev pip install -U pip==20.2 - pip install -r requirements.txt -r requirements-test.txt - + pip install -r requirements.txt -r requirements-test.txt + - name: Run functional tests run: | pytest --junitxml report.xml --cov=. -m "not integration_tests" - + - name: "Upload coverage to Codecov" uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} - fail_ci_if_error: true + fail_ci_if_error: true