From 5b765a6c9b0c45ec4c5746c9addd605ebf697ce0 Mon Sep 17 00:00:00 2001 From: Jo Booth Date: Thu, 12 Oct 2023 17:51:16 -0400 Subject: [PATCH 1/6] fix: LEAP-293: bump pillow version to respond to CVE-2023-4863 (#249) * fix: LEAP-293: bump pillow version to respond to CVE-2023-4863 * bump test runner python version (we dont support 3.7 anyway) --- .github/workflows/tests.yml | 16 ++++++++-------- requirements.txt | 3 +-- 2 files changed, 9 insertions(+), 10 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 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 dedc76f0d1933dfbb3fa9454451cbcdd44e41b77 Mon Sep 17 00:00:00 2001 From: jombooth Date: Thu, 12 Oct 2023 21:54:10 +0000 Subject: [PATCH 2/6] chore: Bump version to 0.0.57.dev --- label_studio_converter/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/label_studio_converter/__init__.py b/label_studio_converter/__init__.py index d5c14b0a..fa45d42d 100644 --- a/label_studio_converter/__init__.py +++ b/label_studio_converter/__init__.py @@ -4,4 +4,4 @@ except ModuleNotFoundError as e: print(e) -__version__ = '0.0.56.dev' +__version__ = '0.0.57.dev' From d1fdd8b140315c46fa6135ef87f74094e2c03c80 Mon Sep 17 00:00:00 2001 From: Jo Booth Date: Thu, 12 Oct 2023 18:31:24 -0400 Subject: [PATCH 3/6] chore: LEAP-293: fix the release workflow by bumping python to 3.8 also (#250) --- .github/workflows/build_pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_pypi.yml b/.github/workflows/build_pypi.yml index 028dbaf1..e7c8da82 100644 --- a/.github/workflows/build_pypi.yml +++ b/.github/workflows/build_pypi.yml @@ -65,7 +65,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.7' + python-version: '3.8' - name: Configure pip cache uses: actions/cache@v3 From 7231f075ef5debf3cdabed5d93e949f9158ccebd Mon Sep 17 00:00:00 2001 From: jombooth Date: Thu, 12 Oct 2023 22:34:28 +0000 Subject: [PATCH 4/6] chore: Bump version to 0.0.58.dev --- label_studio_converter/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/label_studio_converter/__init__.py b/label_studio_converter/__init__.py index fa45d42d..05af951e 100644 --- a/label_studio_converter/__init__.py +++ b/label_studio_converter/__init__.py @@ -4,4 +4,4 @@ except ModuleNotFoundError as e: print(e) -__version__ = '0.0.57.dev' +__version__ = '0.0.58.dev' From 88b3d0e668baf8bd426387149c48a3ef8b28ee0c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 14:16:37 +0100 Subject: [PATCH 5/6] ci: bump thehanimo/pr-title-checker from 1.4.0 to 1.4.1 (#251) Bumps [thehanimo/pr-title-checker](https://github.com/thehanimo/pr-title-checker) from 1.4.0 to 1.4.1. - [Release notes](https://github.com/thehanimo/pr-title-checker/releases) - [Commits](https://github.com/thehanimo/pr-title-checker/compare/v1.4.0...v1.4.1) --- updated-dependencies: - dependency-name: thehanimo/pr-title-checker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/pr-labeler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml index 000738a6..9167c855 100644 --- a/.github/workflows/pr-labeler.yml +++ b/.github/workflows/pr-labeler.yml @@ -29,7 +29,7 @@ jobs: - uses: hmarr/debug-action@v2.1.0 - name: "Validate PR's title" - uses: thehanimo/pr-title-checker@v1.4.0 + uses: thehanimo/pr-title-checker@v1.4.1 with: GITHUB_TOKEN: ${{ github.token }} pass_on_octokit_error: false From 5d4a6d98aaf0d406dc0e390aded931fea750c846 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 16:59:46 +0100 Subject: [PATCH 6/6] ci: bump release-drafter/release-drafter from 5.24.0 to 5.25.0 (#252) Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from 5.24.0 to 5.25.0. - [Release notes](https://github.com/release-drafter/release-drafter/releases) - [Commits](https://github.com/release-drafter/release-drafter/compare/v5.24.0...v5.25.0) --- updated-dependencies: - dependency-name: release-drafter/release-drafter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/pr-labeler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml index 9167c855..4907a9ff 100644 --- a/.github/workflows/pr-labeler.yml +++ b/.github/workflows/pr-labeler.yml @@ -36,7 +36,7 @@ jobs: configuration_path: ".github/pr-title-checker-config.json" - name: "Set PR's label based on title" - uses: release-drafter/release-drafter@v5.24.0 + uses: release-drafter/release-drafter@v5.25.0 with: disable-releaser: true config-name: autolabeler.yml