From ab0c99e034a6cbc40c62a8f3dba9da21e0b14277 Mon Sep 17 00:00:00 2001 From: Ivan <2350327610@qq.com> Date: Wed, 6 Mar 2024 02:55:23 -0500 Subject: [PATCH 01/19] doc:remove python 3.7, 3.8 and add 3.10 --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 6709681..743c297 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: [3.7, 3.8, 3.9] + python-version: [3.9, 3.10] steps: - uses: actions/checkout@v2 - name: Set up Python From 692317a0fe307f2939098f336996465f1e42fd19 Mon Sep 17 00:00:00 2001 From: Ivan <2350327610@qq.com> Date: Wed, 6 Mar 2024 16:04:01 -0500 Subject: [PATCH 02/19] doc:upgrade github action plugin version --- .github/workflows/build-and-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 743c297..5d0f2dc 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -14,9 +14,9 @@ jobs: os: [ubuntu-latest, windows-latest] python-version: [3.9, 3.10] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Display python version From 2f0ba5dcc2b49e4a600777fb2ff448ebcd3e41fe Mon Sep 17 00:00:00 2001 From: Ivan <2350327610@qq.com> Date: Sat, 9 Mar 2024 00:19:01 -0500 Subject: [PATCH 03/19] doc:bug fix --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 5d0f2dc..06b17b8 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: [3.9, 3.10] + python-version: ["3.9", "3.10"] steps: - uses: actions/checkout@v4 - name: Set up Python From c29965deb8eaf6f77a28feba283b24f04d606413 Mon Sep 17 00:00:00 2001 From: Ivan <2350327610@qq.com> Date: Wed, 27 Mar 2024 15:20:04 -0400 Subject: [PATCH 04/19] doc:use updated numpy --- build_tools/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/build_tools/requirements.txt b/build_tools/requirements.txt index c206f44..ae84bf5 100644 --- a/build_tools/requirements.txt +++ b/build_tools/requirements.txt @@ -1,4 +1,5 @@ pytest==7.1.1 +numpy==1.21.0 flake8 pytest-cov click==8.0.3 From 1c09c030028c91f57217760b543c5b8953de6e0c Mon Sep 17 00:00:00 2001 From: Ivan <2350327610@qq.com> Date: Wed, 27 Mar 2024 15:27:58 -0400 Subject: [PATCH 05/19] doc:upgrade numpy --- build_tools/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/requirements.txt b/build_tools/requirements.txt index ae84bf5..522d3c5 100644 --- a/build_tools/requirements.txt +++ b/build_tools/requirements.txt @@ -1,5 +1,5 @@ pytest==7.1.1 -numpy==1.21.0 +numpy==1.21.2 flake8 pytest-cov click==8.0.3 From 1e756e48db149d9c281397c3f5f5bf3af3121444 Mon Sep 17 00:00:00 2001 From: Ivan <2350327610@qq.com> Date: Wed, 27 Mar 2024 15:34:38 -0400 Subject: [PATCH 06/19] doc:upgrade numpy --- build_tools/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/requirements.txt b/build_tools/requirements.txt index 522d3c5..ee8414a 100644 --- a/build_tools/requirements.txt +++ b/build_tools/requirements.txt @@ -1,5 +1,5 @@ pytest==7.1.1 -numpy==1.21.2 +numpy==1.22.4 flake8 pytest-cov click==8.0.3 From f528edb7e69221e60c64c4b12538c24ee0146ab2 Mon Sep 17 00:00:00 2001 From: Ivan <2350327610@qq.com> Date: Wed, 27 Mar 2024 15:43:23 -0400 Subject: [PATCH 07/19] doc:upgrade numpy in pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 782db28..21ac9d8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ requires = [ "setuptools>=42", "wheel", - "numpy>=1.13.3,<1.20.0", + "numpy>=1.22.4", "torch>=1.4.0", "torchvision>=0.2.2", "scikit-learn>=0.23.0" From c318d15eb0bce37c8711450cec60f0b469dd6f96 Mon Sep 17 00:00:00 2001 From: Ivan <2350327610@qq.com> Date: Wed, 27 Mar 2024 16:00:06 -0400 Subject: [PATCH 08/19] doc:update .readthedocs.yml --- .readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index d61e7df..2ce8210 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -6,6 +6,6 @@ sphinx: configuration: docs/conf.py python: - version: 3.7 + version: 3.9 install: - requirements: docs/requirements.txt From adda072e9af3fae82df6c1ce15eea3fa05c61b01 Mon Sep 17 00:00:00 2001 From: Ivan <2350327610@qq.com> Date: Wed, 27 Mar 2024 16:12:04 -0400 Subject: [PATCH 09/19] conf: add build.os in .readthedocs.yml --- .readthedocs.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.readthedocs.yml b/.readthedocs.yml index 2ce8210..14eb317 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -2,6 +2,9 @@ version: 2 formats: [] +build: + os: ubuntu-22.04 + sphinx: configuration: docs/conf.py From d583452c73324bd89c9faa3fc4ab5d1e94046b9e Mon Sep 17 00:00:00 2001 From: Ivan <2350327610@qq.com> Date: Wed, 27 Mar 2024 16:13:44 -0400 Subject: [PATCH 10/19] conf: update .readthedocs.yml --- .readthedocs.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 14eb317..26d184c 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -3,7 +3,9 @@ version: 2 formats: [] build: - os: ubuntu-22.04 + os: "ubuntu-22.04" + tools: + python: "3.10" sphinx: configuration: docs/conf.py From b46545efab30dd7895dfbe1f40b1eed0b890f77c Mon Sep 17 00:00:00 2001 From: Ivan <2350327610@qq.com> Date: Wed, 27 Mar 2024 16:14:27 -0400 Subject: [PATCH 11/19] conf: update .readthedocs.yml --- .readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 26d184c..85e169f 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -11,6 +11,6 @@ sphinx: configuration: docs/conf.py python: - version: 3.9 + version: 3.10 install: - requirements: docs/requirements.txt From ed968e51ef79b5c2850ed9ede289a39fd1103d4a Mon Sep 17 00:00:00 2001 From: Ivan <2350327610@qq.com> Date: Wed, 27 Mar 2024 16:16:40 -0400 Subject: [PATCH 12/19] conf: update .readthedocs.yml --- .readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 85e169f..3462cc9 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -11,6 +11,6 @@ sphinx: configuration: docs/conf.py python: - version: 3.10 + version: "3.10" install: - requirements: docs/requirements.txt From 5fd37b1664ca5bdd7bba34c5ceb59f71f2a59a4c Mon Sep 17 00:00:00 2001 From: Ivan <2350327610@qq.com> Date: Wed, 27 Mar 2024 16:18:17 -0400 Subject: [PATCH 13/19] conf: update .readthedocs.yml --- .readthedocs.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 3462cc9..152e9dd 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -11,6 +11,5 @@ sphinx: configuration: docs/conf.py python: - version: "3.10" install: - requirements: docs/requirements.txt From 3c37b6e37f9044f435e3088c10681ba977ac6bd3 Mon Sep 17 00:00:00 2001 From: Ivan <2350327610@qq.com> Date: Wed, 27 Mar 2024 16:24:48 -0400 Subject: [PATCH 14/19] upgrade sphinx version in docs/requirement.txt --- docs/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index ec9399f..1e61d33 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,6 +1,6 @@ -sphinx==3.2.* -sphinx-panels==0.5.* -sphinxemoji==0.1.8 +sphinx>=5.0 +sphinx-panels== +sphinxemoji== sphinx-copybutton m2r2==0.2.7 mistune==0.8.4 From b386680395704bc35990b6a34981200974cc46d4 Mon Sep 17 00:00:00 2001 From: Ivan <2350327610@qq.com> Date: Wed, 27 Mar 2024 16:26:33 -0400 Subject: [PATCH 15/19] upgrade sphinx-panels and emoji version in docs/requirement.txt --- docs/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 1e61d33..b077ccc 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,6 +1,6 @@ sphinx>=5.0 -sphinx-panels== -sphinxemoji== +sphinx-panels==0.6.0 +sphinxemoji==0.1.8 sphinx-copybutton m2r2==0.2.7 mistune==0.8.4 From 7467635aa715e6cd510bb271504deff1773d11c9 Mon Sep 17 00:00:00 2001 From: Ivan <2350327610@qq.com> Date: Wed, 27 Mar 2024 16:30:28 -0400 Subject: [PATCH 16/19] upgrade sphinx-panels version in docs/requirement.txt --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index b077ccc..7054361 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,5 +1,5 @@ sphinx>=5.0 -sphinx-panels==0.6.0 +sphinx-panels sphinxemoji==0.1.8 sphinx-copybutton m2r2==0.2.7 From b6213f7c360e36455cec43244a0d18258b65f0bd Mon Sep 17 00:00:00 2001 From: Ivan <2350327610@qq.com> Date: Wed, 27 Mar 2024 16:33:09 -0400 Subject: [PATCH 17/19] upgrade m2r2 version in docs/requirement.txt --- docs/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 7054361..32b3ad7 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,8 +1,8 @@ -sphinx>=5.0 +sphinx==5.0 sphinx-panels sphinxemoji==0.1.8 sphinx-copybutton -m2r2==0.2.7 +m2r2 mistune==0.8.4 Jinja2<3.1 Numpy \ No newline at end of file From b21baddcad3aa2c329a7750357e4fac033d55845 Mon Sep 17 00:00:00 2001 From: Ivan <2350327610@qq.com> Date: Wed, 27 Mar 2024 16:36:55 -0400 Subject: [PATCH 18/19] conf: add sphinx_rtd_theme in docs/requirement.txt --- docs/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/requirements.txt b/docs/requirements.txt index 32b3ad7..ab6568e 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,6 +1,7 @@ sphinx==5.0 sphinx-panels sphinxemoji==0.1.8 +sphinx_rtd_theme sphinx-copybutton m2r2 mistune==0.8.4 From 48ac26304c7e3af041eb26768d5f24446d8d8836 Mon Sep 17 00:00:00 2001 From: Ivan <2350327610@qq.com> Date: Mon, 8 Apr 2024 17:58:58 -0400 Subject: [PATCH 19/19] doc:update meta info in setup.py --- setup.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 036cf83..12c9f68 100644 --- a/setup.py +++ b/setup.py @@ -80,15 +80,12 @@ def run(self): "Operating System :: POSIX", "Operating System :: Unix", "Operating System :: MacOS", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", ], keywords=["Deep Learning", "PyTorch", "Ensemble Learning"], packages=find_packages(), cmdclass=cmdclass, - python_requires=">=3.6", + python_requires=">=3.9", install_requires=install_requires, )