From 9520532d7e148b2cf60f1e0f1ca222b3790375db Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Fri, 20 Sep 2024 13:52:22 -0500 Subject: [PATCH] Bump various versions --- .github/workflows/build.yml | 3 +-- dev-environment.yml | 8 ++++---- environment.yml | 8 ++++---- pyproject.toml | 6 +++--- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5718b173..c0c2df58 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,8 +23,7 @@ jobs: strategy: matrix: platform: [ubuntu-latest, windows-latest, macos-latest] - # NB: [3.11.0, 3.11.2] do not have arm64 macos support - python-version: ['3.8', '3.11.3'] + python-version: ['3.8', '3.12'] steps: - uses: actions/checkout@v2 diff --git a/dev-environment.yml b/dev-environment.yml index 3efa9a30..809d84c8 100644 --- a/dev-environment.yml +++ b/dev-environment.yml @@ -18,16 +18,16 @@ name: napari-imagej-dev channels: - conda-forge dependencies: - - python >= 3.8, <3.12 + - python >= 3.8, < 3.13 # Project dependencies - - confuse + - confuse >= 2.0.0 - imglyb >= 2.1.0 - jpype1 >= 1.4.1 - labeling >= 0.1.12 - magicgui >= 0.5.1 - - napari >= 0.4.17, <0.5 + - napari >= 0.4.17 - numpy - - openjdk=8 + - openjdk=11 - pandas - pyimagej >= 1.4.1 - scyjava >= 1.8.1 diff --git a/environment.yml b/environment.yml index ccbd8798..dd5aae2f 100644 --- a/environment.yml +++ b/environment.yml @@ -18,16 +18,16 @@ name: napari-imagej channels: - conda-forge dependencies: - - python >= 3.8, < 3.12 + - python >= 3.8, < 3.13 # Project depenencies - - confuse + - confuse >= 2.0.0 - imglyb >= 2.1.0 - jpype1 >= 1.4.1 - labeling >= 0.1.12 - magicgui >= 0.5.1 - - napari >= 0.4.17, <0.5 + - napari >= 0.4.17 - numpy - - openjdk=8 + - openjdk=11 - pandas - pyimagej >= 1.4.1 - scyjava >= 1.8.1 diff --git a/pyproject.toml b/pyproject.toml index 05908254..70a8b6fc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,14 +32,14 @@ classifiers = [ ] # NB: Keep this in sync with environment.yml AND dev-environment.yml! -requires-python = ">=3.8, <3.12" +requires-python = ">=3.8, <3.13" dependencies = [ - "confuse", + "confuse >= 2.0.0", "imglyb >= 2.1.0", "jpype1 >= 1.4.1", "labeling >= 0.1.12", "magicgui >= 0.5.1", - "napari >= 0.4.17, <0.5", + "napari >= 0.4.17", "numpy", "pandas", "pyimagej >= 1.4.1",