From a67c028fcf73db7663d7454fb0fb0eaa732e16f9 Mon Sep 17 00:00:00 2001 From: Joachim Ungar Date: Fri, 13 Oct 2023 09:25:14 +0200 Subject: [PATCH 1/4] limit dependencies to flask<3.0.0 --- pyproject.toml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b927524b..fce8eb61 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -87,7 +87,7 @@ s3 = [ "s3fs!=2023.9.0", ] serve = [ - "Flask", + "Flask<3.0.0", "Flask-RangeRequest", "werkzeug>=0.15", ] diff --git a/requirements.txt b/requirements.txt index 1f147371..c57c789e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ click-plugins>=1.1.1 click-spinner>=0.1.10 python-dateutil fiona>=1.8.13.post1 -Flask>=1.1.2 +Flask>=1.1.2,<=3.0.0 Flask-RangeRequest>=0.0.2 fsspec[s3]>=0.8.4 geobuf>=1.1.1 From 54da5f6aa3607f4f2d9801f914ba5c4db217eea6 Mon Sep 17 00:00:00 2001 From: Joachim Ungar Date: Fri, 13 Oct 2023 09:30:24 +0200 Subject: [PATCH 2/4] stop testing on ubuntu 20.04; add ubuntu 23.04 to matrix; install test requirements before package --- .github/workflows/python-package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 9b55df2b..e5a1aab8 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -19,7 +19,7 @@ jobs: fail-fast: false matrix: python-version: ["3.8", "3.9", "3.10", "3.11"] - os: ["ubuntu-20.04", "ubuntu-22.04"] + os: ["ubuntu-22.04", "ubuntu-23.04"] steps: - uses: actions/checkout@v2 @@ -37,8 +37,8 @@ jobs: sudo apt-get -y update sudo apt-get install -y gdal-bin python-tk libgdal-dev libproj-dev libgeos-dev python -m pip install --upgrade pip wheel - pip install -e .[complete] pip install -r test/requirements.txt + pip install -e .[complete] pip freeze - name: Lint with flake8 From bb7e4e2624a450afe38f666c618e77d059993eb9 Mon Sep 17 00:00:00 2001 From: Joachim Ungar Date: Fri, 13 Oct 2023 10:27:54 +0200 Subject: [PATCH 3/4] limit dependencies to flask<3.0.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index fce8eb61..49313745 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,7 +50,7 @@ complete = [ "boto3>=1.14.44", "dask", "distributed", - "Flask", + "Flask<3.0.0", "Flask-RangeRequest", "fsspec[http]", "fsspec[s3]", From fbe9d48ea84ef3e7bce557fc6fc36c794fa0eea5 Mon Sep 17 00:00:00 2001 From: Joachim Ungar Date: Mon, 16 Oct 2023 09:30:03 +0200 Subject: [PATCH 4/4] omit ubuntu-23.04 from test matrix for now --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index e5a1aab8..987f133f 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -19,7 +19,7 @@ jobs: fail-fast: false matrix: python-version: ["3.8", "3.9", "3.10", "3.11"] - os: ["ubuntu-22.04", "ubuntu-23.04"] + os: ["ubuntu-22.04"] steps: - uses: actions/checkout@v2