From 7ed1b54c979d131f75bca5537d24ff6fa5f7ab4d Mon Sep 17 00:00:00 2001 From: ddelange <14880945+ddelange@users.noreply.github.com> Date: Fri, 30 Aug 2024 12:10:09 +0200 Subject: [PATCH] Fix readthedocs by manually unpinning werkzeug in the graphene-tornado v2.6.1 release # for now we leave graphene-tornado / graphene on v2 # ref https://github.com/vaexio/vaex/pull/2356#issuecomment-2320707228 # in top level vaex[ci] we added the following (additional) direct reference requirement which adds one commit (https://github.com/ddelange/graphene-tornado/commit/d75f01f) on top of the 2.6.1 release to unpin werkzeug # "graphene-tornado @ https://github.com/ddelange/graphene-tornado/archive/refs/heads/2.6.1.unpin-werkzeug.zip", --- .github/workflows/pythonpackage.yml | 2 +- packages/vaex-graphql/setup.py | 6 +++++- requirements-override.txt | 1 - setup.py | 2 ++ 4 files changed, 8 insertions(+), 3 deletions(-) delete mode 100644 requirements-override.txt diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 6d2a548b20..c1e6627e0b 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -59,7 +59,7 @@ jobs: uses: ./ci/actions/windll - name: Install vaex - run: uv pip install -v --override requirements-override.txt --system .[ci] + run: uv pip install -v --system .[ci] - run: uv pip freeze diff --git a/packages/vaex-graphql/setup.py b/packages/vaex-graphql/setup.py index 8a6e8a0860..1be0a1053b 100644 --- a/packages/vaex-graphql/setup.py +++ b/packages/vaex-graphql/setup.py @@ -12,7 +12,11 @@ license = 'MIT' version = version.__version__ url = 'https://www.github.com/vaexio/vaex' -install_requires_graphql = ['vaex-core>=4.0.0,<5', 'graphene>=2.1.8,<3', 'graphene>=2.1.8,<3', 'graphene-tornado>=2.5.1,<3'] +# for now we leave graphene-tornado / graphene on v2 +# ref https://github.com/vaexio/vaex/pull/2356#issuecomment-2320707228 +# in top level vaex[ci] we added the following (additional) direct reference requirement which adds one commit (https://github.com/ddelange/graphene-tornado/commit/d75f01f) on top of the 2.6.1 release to unpin werkzeug +# "graphene-tornado @ https://github.com/ddelange/graphene-tornado/archive/refs/heads/2.6.1.unpin-werkzeug.zip", +install_requires_graphql = ['vaex-core~=4.0', 'graphene-tornado~=2.5'] setup( name=name + '-graphql', diff --git a/requirements-override.txt b/requirements-override.txt deleted file mode 100644 index ce454c6b98..0000000000 --- a/requirements-override.txt +++ /dev/null @@ -1 +0,0 @@ -Werkzeug>1.0.1 diff --git a/setup.py b/setup.py index 4dbfba4ab0..9288f3ac58 100644 --- a/setup.py +++ b/setup.py @@ -51,6 +51,8 @@ "nbconvert", "jupyterlab", "plotly", + # https://github.com/vaexio/vaex/pull/2356#issuecomment-2320707228 + "graphene-tornado @ https://github.com/ddelange/graphene-tornado/archive/refs/heads/2.6.1.unpin-werkzeug.zip", ] }, )