From f3a90f9f5c4c35dc1d58a5fd681c1847e0a34460 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 14:17:21 +0200 Subject: [PATCH 01/37] Move requirements files to subdirectory --- docs/requirements.txt => requirements/docs.txt | 0 requirements.txt => requirements/required.txt | 0 requirements/test.txt | 3 +++ 3 files changed, 3 insertions(+) rename docs/requirements.txt => requirements/docs.txt (100%) rename requirements.txt => requirements/required.txt (100%) create mode 100644 requirements/test.txt diff --git a/docs/requirements.txt b/requirements/docs.txt similarity index 100% rename from docs/requirements.txt rename to requirements/docs.txt diff --git a/requirements.txt b/requirements/required.txt similarity index 100% rename from requirements.txt rename to requirements/required.txt diff --git a/requirements/test.txt b/requirements/test.txt new file mode 100644 index 00000000..d581a75d --- /dev/null +++ b/requirements/test.txt @@ -0,0 +1,3 @@ +mock +pytest +ruff==0.5.2 From 33bb1dca02a949b338232ce31ac7e4b73cfd25a7 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 14:18:36 +0200 Subject: [PATCH 02/37] Use requirements files in CI --- .github/dependabot.yml | 15 +++++++++------ .github/workflows/tests.yml | 12 +++--------- .readthedocs.yaml | 2 +- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 73ae80fa..9cec9a94 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,11 +5,14 @@ updates: schedule: interval: "daily" - package-ecosystem: "pip" - directory: "/" + directory: "/requirements" schedule: interval: "daily" - # Allow up to 2 open pull requests at a time - open-pull-requests-limit: 2 - allow: - - dependency-name: "timm" - dependency-type: "all" + groups: + torch: + patterns: + - "torch" + - "torchvision" + ignore: + - dependency-name: "setuptools" + update-types: ["version-update:semver-patch"] diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6eb83c10..166bc387 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,9 +21,7 @@ jobs: with: python-version: "3.11" - name: Install dependencies - run: | - python -m pip install --upgrade pip uv - python -m uv pip install ruff==0.5.2 + run: python -m pip install -r requirements/test.txt # Update output format to enable automatic inline annotations. - name: Run Ruff Linter run: ruff check --output-format=github @@ -40,10 +38,6 @@ jobs: with: python-version: 3.9 - name: Install dependencies - run: | - python -m pip install --upgrade pip uv - python -m uv pip install torch==2.3.1+cpu torchvision==0.18.1+cpu -f https://download.pytorch.org/whl/torch_stable.html - make install_dev + run: python -m pip install -r requirements/required.txt -r requirements/test.txt - name: Test with pytest - run: make test - + run: pytest diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 81346fa5..59940a12 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -19,4 +19,4 @@ sphinx: # See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html python: install: - - requirements: docs/requirements.txt \ No newline at end of file + - requirements: requirements/docs.txt From 81082c36f25572dfa2ca7f49afff1f0fd6d3a21f Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 14:25:42 +0200 Subject: [PATCH 03/37] Add minimum test --- .github/workflows/tests.yml | 14 ++++++++++++++ requirements/docs.txt | 8 ++++---- requirements/minimum.old | 12 ++++++++++++ requirements/required.txt | 9 ++++----- 4 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 requirements/minimum.old diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 166bc387..22a526f2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -41,3 +41,17 @@ jobs: run: python -m pip install -r requirements/required.txt -r requirements/test.txt - name: Test with pytest run: pytest + + minimum: + runs-on: ubuntu-latest + needs: [style] + steps: + - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: 3.9 + - name: Install dependencies + run: python -m pip install -r requirements/minimum.old + - name: Test with pytest + run: pytest diff --git a/requirements/docs.txt b/requirements/docs.txt index 7e5b1eff..c3c9694c 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,5 +1,5 @@ -sphinx<7 -sphinx-book-theme==1.1.2 -six==1.15.0 autodocsumm -huggingface_hub \ No newline at end of file +huggingface_hub +six==1.15.0 +sphinx-book-theme==1.1.2 +sphinx<7 diff --git a/requirements/minimum.old b/requirements/minimum.old new file mode 100644 index 00000000..ef7f3319 --- /dev/null +++ b/requirements/minimum.old @@ -0,0 +1,12 @@ +efficientnet-pytorch==0.7.1 +huggingface_hub>=0.24.6 +pillow +pretrainedmodels==0.7.4 +six +timm==0.9.7 +torchvision>=0.5.0 +tqdm + +mock +pytest +ruff==0.5.2 diff --git a/requirements/required.txt b/requirements/required.txt index aa700f60..a94cdea5 100644 --- a/requirements/required.txt +++ b/requirements/required.txt @@ -1,9 +1,8 @@ -torchvision>=0.5.0 -pretrainedmodels==0.7.4 efficientnet-pytorch==0.7.1 -timm==0.9.7 huggingface_hub>=0.24.6 - -tqdm pillow +pretrainedmodels==0.7.4 six +timm==0.9.7 +torchvision>=0.5.0 +tqdm From b4dc27b291b32d88c6dbdb7e840a3804a1ba2d1a Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 14:26:56 +0200 Subject: [PATCH 04/37] Remove six --- pyproject.toml | 2 -- requirements/docs.txt | 1 - requirements/minimum.old | 1 - requirements/required.txt | 1 - 4 files changed, 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a87f8cc7..3f8ddad5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,6 @@ dependencies = [ 'numpy', 'pillow', 'pretrainedmodels==0.7.4', - 'six', 'timm==0.9.7', 'torch', 'torchvision>=0.5', @@ -34,7 +33,6 @@ dynamic = ['version'] docs = [ 'autodocsumm', 'huggingface-hub', - 'six==1.15.0', 'sphinx<7', 'sphinx-book-theme==1.1.2', ] diff --git a/requirements/docs.txt b/requirements/docs.txt index c3c9694c..4a59109d 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,5 +1,4 @@ autodocsumm huggingface_hub -six==1.15.0 sphinx-book-theme==1.1.2 sphinx<7 diff --git a/requirements/minimum.old b/requirements/minimum.old index ef7f3319..e268d6ea 100644 --- a/requirements/minimum.old +++ b/requirements/minimum.old @@ -2,7 +2,6 @@ efficientnet-pytorch==0.7.1 huggingface_hub>=0.24.6 pillow pretrainedmodels==0.7.4 -six timm==0.9.7 torchvision>=0.5.0 tqdm diff --git a/requirements/required.txt b/requirements/required.txt index a94cdea5..b7b5068e 100644 --- a/requirements/required.txt +++ b/requirements/required.txt @@ -2,7 +2,6 @@ efficientnet-pytorch==0.7.1 huggingface_hub>=0.24.6 pillow pretrainedmodels==0.7.4 -six timm==0.9.7 torchvision>=0.5.0 tqdm From 16e75d432b8c2ddeebb15e970a494c2ba5ddbb3e Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 14:35:19 +0200 Subject: [PATCH 05/37] Ensure that pytest can find tests --- tests/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/__init__.py diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 00000000..e69de29b From d8f3d3b5eb8d8fe9699b057777d58288890dbdf7 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 14:40:19 +0200 Subject: [PATCH 06/37] Revert "Remove six" This reverts commit 17389a63df8353759d7aafbb5238b1a880a70d07. --- pyproject.toml | 2 ++ requirements/docs.txt | 1 + requirements/minimum.old | 1 + requirements/required.txt | 1 + 4 files changed, 5 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 3f8ddad5..a87f8cc7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,6 +22,7 @@ dependencies = [ 'numpy', 'pillow', 'pretrainedmodels==0.7.4', + 'six', 'timm==0.9.7', 'torch', 'torchvision>=0.5', @@ -33,6 +34,7 @@ dynamic = ['version'] docs = [ 'autodocsumm', 'huggingface-hub', + 'six==1.15.0', 'sphinx<7', 'sphinx-book-theme==1.1.2', ] diff --git a/requirements/docs.txt b/requirements/docs.txt index 4a59109d..c3c9694c 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,4 +1,5 @@ autodocsumm huggingface_hub +six==1.15.0 sphinx-book-theme==1.1.2 sphinx<7 diff --git a/requirements/minimum.old b/requirements/minimum.old index e268d6ea..ef7f3319 100644 --- a/requirements/minimum.old +++ b/requirements/minimum.old @@ -2,6 +2,7 @@ efficientnet-pytorch==0.7.1 huggingface_hub>=0.24.6 pillow pretrainedmodels==0.7.4 +six timm==0.9.7 torchvision>=0.5.0 tqdm diff --git a/requirements/required.txt b/requirements/required.txt index b7b5068e..a94cdea5 100644 --- a/requirements/required.txt +++ b/requirements/required.txt @@ -2,6 +2,7 @@ efficientnet-pytorch==0.7.1 huggingface_hub>=0.24.6 pillow pretrainedmodels==0.7.4 +six timm==0.9.7 torchvision>=0.5.0 tqdm From 398a4fe13721b967137304028b3160a6cf380874 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 14:46:08 +0200 Subject: [PATCH 07/37] Widest possible deps --- requirements/docs.txt | 10 +++++----- requirements/minimum.old | 22 +++++++++++----------- requirements/required.txt | 12 ++++++------ requirements/test.txt | 6 +++--- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/requirements/docs.txt b/requirements/docs.txt index c3c9694c..205cdcef 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,5 +1,5 @@ -autodocsumm -huggingface_hub -six==1.15.0 -sphinx-book-theme==1.1.2 -sphinx<7 +autodocsumm==0.2.13 +huggingface_hub==0.24.6 +six==1.16.0 +sphinx-book-theme==1.1.3 +sphinx==8.0.2 diff --git a/requirements/minimum.old b/requirements/minimum.old index ef7f3319..af45243d 100644 --- a/requirements/minimum.old +++ b/requirements/minimum.old @@ -1,12 +1,12 @@ -efficientnet-pytorch==0.7.1 -huggingface_hub>=0.24.6 -pillow -pretrainedmodels==0.7.4 -six -timm==0.9.7 -torchvision>=0.5.0 -tqdm +efficientnet-pytorch==0.1.0 +huggingface_hub==0.0.1 +pillow==1.0 +pretrainedmodels==0.1.0 +six==0.9.0 +timm==0.1.1 +torchvision==0.3.0 +tqdm==1.0 -mock -pytest -ruff==0.5.2 +mock==0.4.0 +pytest==2.0.0 +ruff==0.0.13 diff --git a/requirements/required.txt b/requirements/required.txt index a94cdea5..736aa14f 100644 --- a/requirements/required.txt +++ b/requirements/required.txt @@ -1,8 +1,8 @@ efficientnet-pytorch==0.7.1 -huggingface_hub>=0.24.6 -pillow +huggingface_hub==0.24.6 +pillow==10.4.0 pretrainedmodels==0.7.4 -six -timm==0.9.7 -torchvision>=0.5.0 -tqdm +six==1.16.0 +timm==1.0.9 +torchvision==0.19.0 +tqdm==4.66.5 diff --git a/requirements/test.txt b/requirements/test.txt index d581a75d..e83d2829 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,3 +1,3 @@ -mock -pytest -ruff==0.5.2 +mock==5.1.0 +pytest==8.3.2 +ruff==0.6.3 From 73c889cf26c493132b8fc0b6e9a25ec33ff79546 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 14:52:20 +0200 Subject: [PATCH 08/37] Update pillow and torchvision to 3.9 wheels --- requirements/minimum.old | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/minimum.old b/requirements/minimum.old index af45243d..2ad1f0ba 100644 --- a/requirements/minimum.old +++ b/requirements/minimum.old @@ -1,10 +1,10 @@ efficientnet-pytorch==0.1.0 huggingface_hub==0.0.1 -pillow==1.0 +pillow==8.0.0 pretrainedmodels==0.1.0 six==0.9.0 timm==0.1.1 -torchvision==0.3.0 +torchvision==0.8.2 tqdm==1.0 mock==0.4.0 From 04c2f5fa8612e3ced100bbb780025c92200aaa95 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 14:59:06 +0200 Subject: [PATCH 09/37] More minimum wheel versions --- requirements/minimum.old | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/minimum.old b/requirements/minimum.old index 2ad1f0ba..af7995ea 100644 --- a/requirements/minimum.old +++ b/requirements/minimum.old @@ -2,11 +2,11 @@ efficientnet-pytorch==0.1.0 huggingface_hub==0.0.1 pillow==8.0.0 pretrainedmodels==0.1.0 -six==0.9.0 +six==1.5.0 timm==0.1.1 torchvision==0.8.2 -tqdm==1.0 +tqdm==2.0.0 -mock==0.4.0 -pytest==2.0.0 -ruff==0.0.13 +mock==1.1.0 +pytest==2.7.1 +ruff==0.0.17 From 59e5a37247f52e2e35631c35ceb5643b213194fa Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 15:00:13 +0200 Subject: [PATCH 10/37] Skip test deps for now --- requirements/minimum.old | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/minimum.old b/requirements/minimum.old index af7995ea..173b8b82 100644 --- a/requirements/minimum.old +++ b/requirements/minimum.old @@ -7,6 +7,6 @@ timm==0.1.1 torchvision==0.8.2 tqdm==2.0.0 -mock==1.1.0 -pytest==2.7.1 -ruff==0.0.17 +mock +pytest +ruff From 46da56a3fc86a929132913bf92a8e70b19ed7d22 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 15:00:42 +0200 Subject: [PATCH 11/37] Skip non-required deps --- pyproject.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a87f8cc7..f79df8fa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,13 +34,13 @@ dynamic = ['version'] docs = [ 'autodocsumm', 'huggingface-hub', - 'six==1.15.0', - 'sphinx<7', - 'sphinx-book-theme==1.1.2', + 'six', + 'sphinx', + 'sphinx-book-theme', ] test = [ 'pytest', - 'ruff==0.5.2', + 'ruff', ] [project.urls] From c03986af5610468fc42df157a0d019b00713c5cd Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 15:01:14 +0200 Subject: [PATCH 12/37] Don't wait to start tests --- .github/workflows/tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 22a526f2..e6b310cc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -30,7 +30,6 @@ jobs: test: runs-on: ubuntu-latest - needs: [style] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} @@ -44,7 +43,6 @@ jobs: minimum: runs-on: ubuntu-latest - needs: [style] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} From ff70198f623040dfa5b5ce7e37e8683eb19f5323 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 15:03:56 +0200 Subject: [PATCH 13/37] Prevent numpy 2 from being used --- .github/workflows/tests.yml | 2 +- requirements/min-cons.old | 1 + requirements/{minimum.old => min-reqs.old} | 0 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 requirements/min-cons.old rename requirements/{minimum.old => min-reqs.old} (100%) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e6b310cc..9e45f864 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -50,6 +50,6 @@ jobs: with: python-version: 3.9 - name: Install dependencies - run: python -m pip install -r requirements/minimum.old + run: python -m pip install -r requirements/min-reqs.old -c requirements/min-cons.old - name: Test with pytest run: pytest diff --git a/requirements/min-cons.old b/requirements/min-cons.old new file mode 100644 index 00000000..4d3693d6 --- /dev/null +++ b/requirements/min-cons.old @@ -0,0 +1 @@ +numpy<2 diff --git a/requirements/minimum.old b/requirements/min-reqs.old similarity index 100% rename from requirements/minimum.old rename to requirements/min-reqs.old From bd3fd52680f2feba14dd74cd973a6e2071ad0835 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 16:41:15 +0200 Subject: [PATCH 14/37] Newer pretrainedmodels for DPN --- requirements/min-reqs.old | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/min-reqs.old b/requirements/min-reqs.old index 173b8b82..d607f3ef 100644 --- a/requirements/min-reqs.old +++ b/requirements/min-reqs.old @@ -1,7 +1,7 @@ efficientnet-pytorch==0.1.0 huggingface_hub==0.0.1 pillow==8.0.0 -pretrainedmodels==0.1.0 +pretrainedmodels==0.2.0 six==1.5.0 timm==0.1.1 torchvision==0.8.2 From b1f814abc03475f9490bf1561c4888210145647f Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 16:45:12 +0200 Subject: [PATCH 15/37] pretrainedmodel 0.6 needed for senet --- requirements/min-reqs.old | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/min-reqs.old b/requirements/min-reqs.old index d607f3ef..a7e50bf5 100644 --- a/requirements/min-reqs.old +++ b/requirements/min-reqs.old @@ -1,7 +1,7 @@ efficientnet-pytorch==0.1.0 huggingface_hub==0.0.1 pillow==8.0.0 -pretrainedmodels==0.2.0 +pretrainedmodels==0.6.0 six==1.5.0 timm==0.1.1 torchvision==0.8.2 From d863a49ddeb12749322565f4665b0ece8220e62e Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 16:51:02 +0200 Subject: [PATCH 16/37] efficientnet 0.6 needed for url_adv_map --- requirements/min-reqs.old | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/min-reqs.old b/requirements/min-reqs.old index a7e50bf5..7c65dc31 100644 --- a/requirements/min-reqs.old +++ b/requirements/min-reqs.old @@ -1,4 +1,4 @@ -efficientnet-pytorch==0.1.0 +efficientnet-pytorch==0.6.0 huggingface_hub==0.0.1 pillow==8.0.0 pretrainedmodels==0.6.0 From 4c8e94c83a2002a3110e55c3e9661f4e2fa7ae7c Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 16:56:33 +0200 Subject: [PATCH 17/37] try 0.6.1 --- requirements/min-reqs.old | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/min-reqs.old b/requirements/min-reqs.old index 7c65dc31..868f0707 100644 --- a/requirements/min-reqs.old +++ b/requirements/min-reqs.old @@ -1,4 +1,4 @@ -efficientnet-pytorch==0.6.0 +efficientnet-pytorch==0.6.1 huggingface_hub==0.0.1 pillow==8.0.0 pretrainedmodels==0.6.0 From df1d528528915637587a2f92c0b30eff5d3768f7 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 16:59:24 +0200 Subject: [PATCH 18/37] timm 0.2.1 needed for efficientnet --- requirements/min-reqs.old | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/min-reqs.old b/requirements/min-reqs.old index 868f0707..9b5e7210 100644 --- a/requirements/min-reqs.old +++ b/requirements/min-reqs.old @@ -3,7 +3,7 @@ huggingface_hub==0.0.1 pillow==8.0.0 pretrainedmodels==0.6.0 six==1.5.0 -timm==0.1.1 +timm==0.2.1 torchvision==0.8.2 tqdm==2.0.0 From b8d02414766a7997bb16ab06ce0f4d110f682be4 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 17:01:27 +0200 Subject: [PATCH 19/37] timm 0.9 needed for timm.layers --- requirements/min-reqs.old | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/min-reqs.old b/requirements/min-reqs.old index 9b5e7210..bcd7ef5f 100644 --- a/requirements/min-reqs.old +++ b/requirements/min-reqs.old @@ -3,7 +3,7 @@ huggingface_hub==0.0.1 pillow==8.0.0 pretrainedmodels==0.6.0 six==1.5.0 -timm==0.2.1 +timm==0.9.0 torchvision==0.8.2 tqdm==2.0.0 From a63746fd58945b70d4206b60c6eaa3fe74acf11f Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 17:04:19 +0200 Subject: [PATCH 20/37] tqdm 4.36.0 needed for submodule architecture --- requirements/min-reqs.old | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/min-reqs.old b/requirements/min-reqs.old index bcd7ef5f..618be7f0 100644 --- a/requirements/min-reqs.old +++ b/requirements/min-reqs.old @@ -5,7 +5,7 @@ pretrainedmodels==0.6.0 six==1.5.0 timm==0.9.0 torchvision==0.8.2 -tqdm==2.0.0 +tqdm==4.36.0 mock pytest From 4fec7865a297c3da363955fd50356f0d3e8b6027 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 17:08:19 +0200 Subject: [PATCH 21/37] hf-hub 0.0.15 needed for pytorch mixin --- requirements/min-reqs.old | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/min-reqs.old b/requirements/min-reqs.old index 618be7f0..5da07a4f 100644 --- a/requirements/min-reqs.old +++ b/requirements/min-reqs.old @@ -1,5 +1,5 @@ efficientnet-pytorch==0.6.1 -huggingface_hub==0.0.1 +huggingface_hub==0.0.15 pillow==8.0.0 pretrainedmodels==0.6.0 six==1.5.0 From c3a67d8f971b89c793ce2d84b40e49266265363d Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 17:11:36 +0200 Subject: [PATCH 22/37] hf-hub 0.10.0 needed for ModelCard --- requirements/min-reqs.old | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/min-reqs.old b/requirements/min-reqs.old index 5da07a4f..e6bc56f9 100644 --- a/requirements/min-reqs.old +++ b/requirements/min-reqs.old @@ -1,5 +1,5 @@ efficientnet-pytorch==0.6.1 -huggingface_hub==0.0.15 +huggingface_hub==0.10.0 pillow==8.0.0 pretrainedmodels==0.6.0 six==1.5.0 From 08276450d4a5c00e9fd0ed1fd3ca5c86e09c15b5 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 17:39:52 +0200 Subject: [PATCH 23/37] pretrainedmodels 0.7.1 needed for last_linear --- requirements/min-reqs.old | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/min-reqs.old b/requirements/min-reqs.old index e6bc56f9..fee194b3 100644 --- a/requirements/min-reqs.old +++ b/requirements/min-reqs.old @@ -1,7 +1,7 @@ efficientnet-pytorch==0.6.1 huggingface_hub==0.10.0 pillow==8.0.0 -pretrainedmodels==0.6.0 +pretrainedmodels==0.7.1 six==1.5.0 timm==0.9.0 torchvision==0.8.2 From 1267aabff10511761798196e43c48c1919df61b0 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 4 Sep 2024 17:49:35 +0200 Subject: [PATCH 24/37] Don't test minimum version of test deps for now --- .github/workflows/tests.yml | 2 +- requirements/min-reqs.old | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9e45f864..1dc13dfd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -50,6 +50,6 @@ jobs: with: python-version: 3.9 - name: Install dependencies - run: python -m pip install -r requirements/min-reqs.old -c requirements/min-cons.old + run: python -m pip install -r requirements/min-reqs.old -c requirements/min-cons.old -r requirements/test.txt - name: Test with pytest run: pytest diff --git a/requirements/min-reqs.old b/requirements/min-reqs.old index fee194b3..c7d191e7 100644 --- a/requirements/min-reqs.old +++ b/requirements/min-reqs.old @@ -6,7 +6,3 @@ six==1.5.0 timm==0.9.0 torchvision==0.8.2 tqdm==4.36.0 - -mock -pytest -ruff From d835a41d17b601ac99b20654e8b3f70d3c86f1de Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 6 Sep 2024 17:36:14 +0200 Subject: [PATCH 25/37] Remove mock --- requirements/test.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/test.txt b/requirements/test.txt index e83d2829..c0bce5cb 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,3 +1,2 @@ -mock==5.1.0 pytest==8.3.2 ruff==0.6.3 From e4714166f61d7010554d04daf29e1d425146b52a Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 11 Sep 2024 16:25:25 +0200 Subject: [PATCH 26/37] hf-hub 0.22.0 needed for ModelCard.from_template(template_Str) --- requirements/min-reqs.old | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/min-reqs.old b/requirements/min-reqs.old index c7d191e7..19580911 100644 --- a/requirements/min-reqs.old +++ b/requirements/min-reqs.old @@ -1,5 +1,5 @@ efficientnet-pytorch==0.6.1 -huggingface_hub==0.10.0 +huggingface_hub==0.22.0 pillow==8.0.0 pretrainedmodels==0.7.1 six==1.5.0 From 571f5c05d28ae39ef8971a6e9736f90b17f8fa39 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 11 Sep 2024 16:26:38 +0200 Subject: [PATCH 27/37] tqdm 4.42.1+ required by hf-hub 0.22.0 --- requirements/min-reqs.old | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/min-reqs.old b/requirements/min-reqs.old index 19580911..3da7f7d8 100644 --- a/requirements/min-reqs.old +++ b/requirements/min-reqs.old @@ -5,4 +5,4 @@ pretrainedmodels==0.7.1 six==1.5.0 timm==0.9.0 torchvision==0.8.2 -tqdm==4.36.0 +tqdm==4.42.1 From b3f047c2ccf9f4bb6a330eff8cea0c45f5b66bcc Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 11 Sep 2024 17:05:53 +0200 Subject: [PATCH 28/37] Add numpy/torch --- .github/workflows/tests.yml | 2 +- requirements/docs.txt | 4 ++-- requirements/min-cons.old | 1 - requirements/{min-reqs.old => minimum.old} | 4 +++- requirements/required.txt | 4 +++- requirements/test.txt | 4 ++-- 6 files changed, 11 insertions(+), 8 deletions(-) delete mode 100644 requirements/min-cons.old rename requirements/{min-reqs.old => minimum.old} (70%) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1dc13dfd..772b106c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -50,6 +50,6 @@ jobs: with: python-version: 3.9 - name: Install dependencies - run: python -m pip install -r requirements/min-reqs.old -c requirements/min-cons.old -r requirements/test.txt + run: python -m pip install -r requirements/minimum.old -r requirements/test.txt - name: Test with pytest run: pytest diff --git a/requirements/docs.txt b/requirements/docs.txt index 205cdcef..50fc866e 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,5 +1,5 @@ autodocsumm==0.2.13 -huggingface_hub==0.24.6 +huggingface-hub==0.24.6 six==1.16.0 -sphinx-book-theme==1.1.3 sphinx==8.0.2 +sphinx-book-theme==1.1.3 diff --git a/requirements/min-cons.old b/requirements/min-cons.old deleted file mode 100644 index 4d3693d6..00000000 --- a/requirements/min-cons.old +++ /dev/null @@ -1 +0,0 @@ -numpy<2 diff --git a/requirements/min-reqs.old b/requirements/minimum.old similarity index 70% rename from requirements/min-reqs.old rename to requirements/minimum.old index 3da7f7d8..0c24689e 100644 --- a/requirements/min-reqs.old +++ b/requirements/minimum.old @@ -1,8 +1,10 @@ efficientnet-pytorch==0.6.1 -huggingface_hub==0.22.0 +huggingface-hub==0.22.0 +numpy==1.19.3 pillow==8.0.0 pretrainedmodels==0.7.1 six==1.5.0 timm==0.9.0 +torch==1.7.1 torchvision==0.8.2 tqdm==4.42.1 diff --git a/requirements/required.txt b/requirements/required.txt index 736aa14f..1fb2ba74 100644 --- a/requirements/required.txt +++ b/requirements/required.txt @@ -1,8 +1,10 @@ efficientnet-pytorch==0.7.1 huggingface_hub==0.24.6 +numpy==2.1.1 pillow==10.4.0 pretrainedmodels==0.7.4 six==1.16.0 timm==1.0.9 -torchvision==0.19.0 +torch==2.4.1 +torchvision==0.19.1 tqdm==4.66.5 diff --git a/requirements/test.txt b/requirements/test.txt index c0bce5cb..5c105705 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,2 +1,2 @@ -pytest==8.3.2 -ruff==0.6.3 +pytest==8.3.3 +ruff==0.6.4 From 82ab059f1714affac14278ec9f3396a791366e49 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 11 Sep 2024 17:34:16 +0200 Subject: [PATCH 29/37] Newer Python version --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 772b106c..0da4c4eb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -35,7 +35,7 @@ jobs: - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: "3.11" - name: Install dependencies run: python -m pip install -r requirements/required.txt -r requirements/test.txt - name: Test with pytest @@ -48,7 +48,7 @@ jobs: - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: "3.9" - name: Install dependencies run: python -m pip install -r requirements/minimum.old -r requirements/test.txt - name: Test with pytest From ca431af34315d4a5847c3edfda7343797cd72561 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 11 Sep 2024 17:48:29 +0200 Subject: [PATCH 30/37] See if torch is causing the segfault --- requirements/minimum.old | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/minimum.old b/requirements/minimum.old index 0c24689e..8481e28b 100644 --- a/requirements/minimum.old +++ b/requirements/minimum.old @@ -5,6 +5,6 @@ pillow==8.0.0 pretrainedmodels==0.7.1 six==1.5.0 timm==0.9.0 -torch==1.7.1 -torchvision==0.8.2 +torch==2.4.1 +torchvision==0.19.1 tqdm==4.42.1 From 57035bdbfe021bb1df6c6727ba3ba51bd6b3e896 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 11 Sep 2024 18:00:23 +0200 Subject: [PATCH 31/37] Try torch 2.0.0 --- requirements/minimum.old | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/minimum.old b/requirements/minimum.old index 8481e28b..ead0f021 100644 --- a/requirements/minimum.old +++ b/requirements/minimum.old @@ -1,10 +1,10 @@ efficientnet-pytorch==0.6.1 -huggingface-hub==0.22.0 +huggingface-hub==0.24.0 numpy==1.19.3 pillow==8.0.0 pretrainedmodels==0.7.1 six==1.5.0 timm==0.9.0 -torch==2.4.1 -torchvision==0.19.1 +torch==2.0.0 +torchvision==0.15.1 tqdm==4.42.1 From a8fba189b33a552f12c4a802cb91cdeeca3e2162 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 11 Sep 2024 18:15:27 +0200 Subject: [PATCH 32/37] Try torch 1.10 --- requirements/minimum.old | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/minimum.old b/requirements/minimum.old index ead0f021..2d15b052 100644 --- a/requirements/minimum.old +++ b/requirements/minimum.old @@ -5,6 +5,6 @@ pillow==8.0.0 pretrainedmodels==0.7.1 six==1.5.0 timm==0.9.0 -torch==2.0.0 -torchvision==0.15.1 +torch==1.10.0 +torchvision==0.11.0 tqdm==4.42.1 From b5c7437c198237d5f56f2eb435e66ec8c0ad1f11 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 12 Sep 2024 10:55:58 +0200 Subject: [PATCH 33/37] torch 1.10 does not exist --- requirements/minimum.old | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/minimum.old b/requirements/minimum.old index 2d15b052..5111d8d7 100644 --- a/requirements/minimum.old +++ b/requirements/minimum.old @@ -5,6 +5,6 @@ pillow==8.0.0 pretrainedmodels==0.7.1 six==1.5.0 timm==0.9.0 -torch==1.10.0 +torch==1.10.0+cu102 torchvision==0.11.0 tqdm==4.42.1 From c06e19c1e8d3b295ca106c8a3bb6b0fd62786b8e Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 12 Sep 2024 10:58:08 +0200 Subject: [PATCH 34/37] torchvision 0.11.1 --- requirements/minimum.old | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/minimum.old b/requirements/minimum.old index 5111d8d7..0db2450d 100644 --- a/requirements/minimum.old +++ b/requirements/minimum.old @@ -5,6 +5,6 @@ pillow==8.0.0 pretrainedmodels==0.7.1 six==1.5.0 timm==0.9.0 -torch==1.10.0+cu102 -torchvision==0.11.0 +torch==1.10.0 +torchvision==0.11.1 tqdm==4.42.1 From 821c4abb08dcb23536a4550af8c29734e382a545 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 12 Sep 2024 11:20:57 +0200 Subject: [PATCH 35/37] Try torch 1.9 --- requirements/minimum.old | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/minimum.old b/requirements/minimum.old index 0db2450d..3f687871 100644 --- a/requirements/minimum.old +++ b/requirements/minimum.old @@ -5,6 +5,6 @@ pillow==8.0.0 pretrainedmodels==0.7.1 six==1.5.0 timm==0.9.0 -torch==1.10.0 -torchvision==0.11.1 +torch==1.9.0 +torchvision==0.10.0 tqdm==4.42.1 From e517d345d9129aa85193f028ca3286de67d03ba3 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 12 Sep 2024 12:10:57 +0200 Subject: [PATCH 36/37] Try torch 1.8 --- requirements/minimum.old | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/minimum.old b/requirements/minimum.old index 3f687871..ee655eb0 100644 --- a/requirements/minimum.old +++ b/requirements/minimum.old @@ -5,6 +5,6 @@ pillow==8.0.0 pretrainedmodels==0.7.1 six==1.5.0 timm==0.9.0 -torch==1.9.0 -torchvision==0.10.0 +torch==1.8.0 +torchvision==0.9.0 tqdm==4.42.1 From 57e55aabef0d87ceec942765e9e7b258ebbfbd93 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 12 Sep 2024 13:39:04 +0200 Subject: [PATCH 37/37] Update pyproject.toml dependencies --- pyproject.toml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f79df8fa..3df76c0f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,16 +17,16 @@ classifiers = [ 'Programming Language :: Python :: Implementation :: PyPy', ] dependencies = [ - 'efficientnet-pytorch==0.7.1', - 'huggingface-hub>=0.24.6', - 'numpy', - 'pillow', - 'pretrainedmodels==0.7.4', - 'six', - 'timm==0.9.7', - 'torch', - 'torchvision>=0.5', - 'tqdm', + 'efficientnet-pytorch>=0.6.1', + 'huggingface-hub>=0.24', + 'numpy>=1.19.3', + 'pillow>=8', + 'pretrainedmodels>=0.7.1', + 'six>=1.5', + 'timm>=0.9', + 'torch>=1.8', + 'torchvision>=0.9', + 'tqdm>=4.42.1', ] dynamic = ['version']