From 9e254c8afc444fb870133dc719557b4f1c32a413 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Fri, 8 Dec 2023 17:17:27 -0500 Subject: [PATCH 1/4] Drop Python 3.7 and announce support for 3.12 --- .github/workflows/test.yml | 2 +- heudiconv/info.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7925b1e9..6ca1e10e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,11 +14,11 @@ jobs: fail-fast: false matrix: python-version: - - '3.7' - '3.8' - '3.9' - '3.10' - '3.11' + - '3.12' steps: - name: Check out repository uses: actions/checkout@v4 diff --git a/heudiconv/info.py b/heudiconv/info.py index e76bc37f..955dacf5 100644 --- a/heudiconv/info.py +++ b/heudiconv/info.py @@ -11,16 +11,16 @@ "Environment :: Console", "Intended Audience :: Science/Research", "License :: OSI Approved :: Apache Software License", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Topic :: Scientific/Engineering", "Typing :: Typed", ] -PYTHON_REQUIRES = ">=3.7" +PYTHON_REQUIRES = ">=3.8" REQUIRES = [ # not usable in some use cases since might be just a downloader, not binary From d87696874be371f928bb0d4de918e4aaf1fd926e Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Fri, 8 Dec 2023 17:21:53 -0500 Subject: [PATCH 2/4] [DATALAD RUNCMD] Use 3.8 in workflows === Do not change lines below === { "chain": [], "cmd": "sed -i -e 's,3\\.7,3.8,g' .github/workflows/codespell.yml .github/workflows/docker.yml .github/workflows/lint.yml .github/workflows/release.yml .github/workflows/test.yml .github/workflows/typing.yml", "exit": 0, "extra_inputs": [], "inputs": [], "outputs": [], "pwd": "." } ^^^ Do not change lines above ^^^ --- .github/workflows/lint.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/typing.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d721fa01..aeaf4f42 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.7' + python-version: '3.8' - name: Install dependencies run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fc4b74c9..b720c2d6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,7 +36,7 @@ jobs: if: steps.auto-version.outputs.version != '' uses: actions/setup-python@v4 with: - python-version: '^3.7' + python-version: '^3.8' - name: Install Python dependencies if: steps.auto-version.outputs.version != '' diff --git a/.github/workflows/typing.yml b/.github/workflows/typing.yml index bc6b7d76..82a24486 100644 --- a/.github/workflows/typing.yml +++ b/.github/workflows/typing.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.7' + python-version: '3.8' - name: Install dependencies run: | From 5ab3193f90d1cabea239b6d5fe1bbb5caea1ab53 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Fri, 8 Dec 2023 17:28:27 -0500 Subject: [PATCH 3/4] Try newer versioningit (may be would be the one which allows later setuptools) --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c077c97b..c25936e8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ "setuptools >= 46.4.0", - "versioningit ~= 1.0", + "versioningit ~= 2.3", "wheel ~= 0.32" ] build-backend = "setuptools.build_meta" From 2e761a5d532f68474497bfdb0e80af81ada54dba Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Fri, 8 Dec 2023 17:56:51 -0500 Subject: [PATCH 4/4] Not ready for 3.12 yet due to pylibjpeg-libjpeg/ --- .github/workflows/test.yml | 1 - heudiconv/info.py | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ca1e10e..ef3a9c6d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,6 @@ jobs: - '3.9' - '3.10' - '3.11' - - '3.12' steps: - name: Check out repository uses: actions/checkout@v4 diff --git a/heudiconv/info.py b/heudiconv/info.py index 955dacf5..74deecf2 100644 --- a/heudiconv/info.py +++ b/heudiconv/info.py @@ -15,7 +15,6 @@ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", "Topic :: Scientific/Engineering", "Typing :: Typed", ]