From d4f3f82fa497eae43e0c0b7281215e742d50cc74 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 12 Aug 2024 11:43:52 -0500 Subject: [PATCH] Update Python version range * Drop support for Python 3.7 * Declare support for Python 3.11 and 3.12 * Remove Windows CI build exclusion (fingers crossed!) --- .github/workflows/build.yml | 10 +--------- dev-environment.yml | 2 +- environment.yml | 2 +- pyproject.toml | 5 +++-- setup.cfg | 2 +- 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a2248f6..df0e474 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,15 +16,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ["3.7", "3.10"] - # Breaks due to https://github.com/jpype-project/jpype/issues/1009 - # Should be included once the fix is released - exclude: - - os: windows-latest - python-version: "3.10" - include: - - os: windows-latest - python-version: "3.9" + python-version: ["3.8", "3.12"] steps: - uses: actions/checkout@v2 diff --git a/dev-environment.yml b/dev-environment.yml index 4f5c6f3..156ed64 100644 --- a/dev-environment.yml +++ b/dev-environment.yml @@ -19,7 +19,7 @@ name: imglyb-dev channels: - conda-forge dependencies: - - python >= 3.7 + - python >= 3.8 # Project dependencies - jpype1 - numpy diff --git a/environment.yml b/environment.yml index 6eaeaef..fd7e700 100644 --- a/environment.yml +++ b/environment.yml @@ -19,7 +19,7 @@ name: imglyb channels: - conda-forge dependencies: - - python >= 3.7 + - python >= 3.8 # Project dependencies - jpype1 - numpy diff --git a/pyproject.toml b/pyproject.toml index bf42e36..53dd108 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,10 +22,11 @@ classifiers = [ "Intended Audience :: Education", "Intended Audience :: Science/Research", "Programming Language :: Python :: 3 :: Only", - "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", "License :: OSI Approved :: BSD License", "Operating System :: Microsoft :: Windows", "Operating System :: Unix", @@ -39,7 +40,7 @@ classifiers = [ ] # NB: Keep this in sync with environment.yml AND dev-environment.yml! -requires-python = ">=3.7" +requires-python = ">=3.8" dependencies = [ "numpy", "jpype1 >= 1.3.0", diff --git a/setup.cfg b/setup.cfg index 110a77e..db9f4e2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,4 +5,4 @@ max-line-length = 88 extend-ignore = E203 # Unfortunately, flake8 doesn't pick up on our declaration in pyproject.toml -min_python_version = 3.7.0 +min_python_version = 3.8.0