From 435b68c3dd8ef2000d8b7c17f4556353bc53330f Mon Sep 17 00:00:00 2001 From: Daniel Gaspar Date: Fri, 26 Jan 2024 13:42:31 +0000 Subject: [PATCH 1/4] fix: relax packaging dependency --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f12f6c1..2077363 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ "odelasticsearch.https = es.opendistro.sqlalchemy:ESHTTPSDialect", ] }, - install_requires=["elasticsearch>7, <7.14", "packaging>=21.0, <22.0", "sqlalchemy"], + install_requires=["elasticsearch>7, <7.14", "packaging>=21.0", "sqlalchemy"], extras_require={"opendistro": ["requests_aws4auth", "boto3"]}, author="Preset Inc.", author_email="daniel@preset.io", From 5f0939393cf3aa937e43ea3072b01a15268f9de7 Mon Sep 17 00:00:00 2001 From: Daniel Gaspar Date: Fri, 26 Jan 2024 14:04:14 +0000 Subject: [PATCH 2/4] fix CI --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4137b01..e3dd683 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ on: jobs: lint: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 strategy: matrix: python-version: [3.7] @@ -35,7 +35,7 @@ jobs: run: mypy es tests: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 strategy: matrix: python-version: [3.7, 3.8, 3.9] From 97e26c5aae17ca764b59740e8f02707bcd5ddd46 Mon Sep 17 00:00:00 2001 From: Daniel Gaspar Date: Fri, 26 Jan 2024 14:09:12 +0000 Subject: [PATCH 3/4] fix CI --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3dd683..11ba80a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,8 +79,6 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - sudo apt-get update - sudo apt-get install -y python-dev pip install --upgrade pip pip install -r requirements.txt pip install -r requirements-dev.txt From b15712ebfcc7dca16dc57cd0bb1f095a4f2d3f6e Mon Sep 17 00:00:00 2001 From: Daniel Gaspar Date: Fri, 26 Jan 2024 14:10:10 +0000 Subject: [PATCH 4/4] fix CI --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 11ba80a..da9bd20 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,6 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - sudo apt-get update - sudo apt-get install -y python-dev pip install --upgrade pip pip install -r requirements.txt pip install -r requirements-dev.txt