From 36aa7686eb7e05a859890377c7081db9122684d6 Mon Sep 17 00:00:00 2001 From: scap3yvt <149599669+scap3yvt@users.noreply.github.com> Date: Thu, 11 Jan 2024 10:34:42 -0500 Subject: [PATCH 1/6] checking a lower version of gdown --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4b01240a7..55ef5d747 100644 --- a/setup.py +++ b/setup.py @@ -98,7 +98,7 @@ def run(self): "pyyaml", "tiffslide", "matplotlib", - "gdown", + "gdown=4.7.0", "pytest", "coverage", "pytest-cov", From 30c9f347d455ea761c3f637ee32340f2bc032aa9 Mon Sep 17 00:00:00 2001 From: scap3yvt <149599669+scap3yvt@users.noreply.github.com> Date: Thu, 11 Jan 2024 10:59:18 -0500 Subject: [PATCH 2/6] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 76abfbeda..452ca4766 100644 --- a/setup.py +++ b/setup.py @@ -98,7 +98,7 @@ def run(self): "pyyaml", "tiffslide", "matplotlib", - "gdown=4.7.0", + "gdown==4.7.0", "pytest", "coverage", "pytest-cov", From 4f4110b6e8355b0962406061d8510149c80bd945 Mon Sep 17 00:00:00 2001 From: scap3yvt <149599669+scap3yvt@users.noreply.github.com> Date: Thu, 11 Jan 2024 14:57:57 -0500 Subject: [PATCH 3/6] disable verify --- testing/test_full.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/test_full.py b/testing/test_full.py index a323d47e0..772258320 100644 --- a/testing/test_full.py +++ b/testing/test_full.py @@ -123,7 +123,7 @@ def test_generic_download_data(): if not os.path.isfile(file): print("Downloading and extracting sample data") output = os.path.join(testingDir, "gandlf_unit_test_data.tgz") - gdown.download(urlToDownload, output, quiet=False) + gdown.download(urlToDownload, output, quiet=False, verify = True) with zipfile.ZipFile(output, "r") as zip_ref: zip_ref.extractall(testingDir) os.remove(output) From e3299dfb92bc6fd4ca57adf0dd6f6c594af5fb47 Mon Sep 17 00:00:00 2001 From: scap3yvt <149599669+scap3yvt@users.noreply.github.com> Date: Thu, 11 Jan 2024 15:36:40 -0500 Subject: [PATCH 4/6] trying new python version --- .github/workflows/openfl-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/openfl-test.yml b/.github/workflows/openfl-test.yml index dbc9958e0..98ee0f82d 100644 --- a/.github/workflows/openfl-test.yml +++ b/.github/workflows/openfl-test.yml @@ -61,11 +61,11 @@ jobs: key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }} restore-keys: | ${{ runner.os }}-pip- - - name: Set up Python 3.9 + - name: Set up Python 3.11 if: steps.changed-files-specific.outputs.only_modified == 'false' # Run on any non-docs change uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: 3.11 - name: Install dependencies and package if: steps.changed-files-specific.outputs.only_modified == 'false' # Run on any non-docs change run: | From b12069c7c1afa914201dc6498c6a84a10cda9b65 Mon Sep 17 00:00:00 2001 From: scap3yvt <149599669+scap3yvt@users.noreply.github.com> Date: Thu, 11 Jan 2024 15:47:15 -0500 Subject: [PATCH 5/6] revert --- .github/workflows/openfl-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/openfl-test.yml b/.github/workflows/openfl-test.yml index 98ee0f82d..dbc9958e0 100644 --- a/.github/workflows/openfl-test.yml +++ b/.github/workflows/openfl-test.yml @@ -61,11 +61,11 @@ jobs: key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }} restore-keys: | ${{ runner.os }}-pip- - - name: Set up Python 3.11 + - name: Set up Python 3.9 if: steps.changed-files-specific.outputs.only_modified == 'false' # Run on any non-docs change uses: actions/setup-python@v4 with: - python-version: 3.11 + python-version: 3.9 - name: Install dependencies and package if: steps.changed-files-specific.outputs.only_modified == 'false' # Run on any non-docs change run: | From b3dc6faa509730120e12838d414774e61dfcdac4 Mon Sep 17 00:00:00 2001 From: scap3yvt <149599669+scap3yvt@users.noreply.github.com> Date: Thu, 11 Jan 2024 15:47:47 -0500 Subject: [PATCH 6/6] fix `gdown` version reference: https://github.com/wkentaro/gdown/issues/291#issuecomment-1887060708 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 452ca4766..4917c2432 100644 --- a/setup.py +++ b/setup.py @@ -98,7 +98,7 @@ def run(self): "pyyaml", "tiffslide", "matplotlib", - "gdown==4.7.0", + "gdown==4.6.3", "pytest", "coverage", "pytest-cov",