diff --git a/.github/workflows/pytest-workflow-macos.yml b/.github/workflows/pytest-workflow-macos.yml index ac68cf98..7731eaee 100644 --- a/.github/workflows/pytest-workflow-macos.yml +++ b/.github/workflows/pytest-workflow-macos.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: os: [macos-latest] - python-version: ["3.10", "3.11", "3.12", "3.13"] + python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/pytest-workflow.yml b/.github/workflows/pytest-workflow.yml index 37ca912b..15bf1897 100644 --- a/.github/workflows/pytest-workflow.yml +++ b/.github/workflows/pytest-workflow.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: ["3.10", "3.11", "3.12","3.13"] + python-version: ["3.10", "3.11", "3.12","3.13","3.14"] steps: - uses: actions/checkout@v4 diff --git a/envs/environment-detector-m1.yml b/envs/environment-detector-m1.yml index 3eb713b8..067aa635 100644 --- a/envs/environment-detector-m1.yml +++ b/envs/environment-detector-m1.yml @@ -13,7 +13,7 @@ dependencies: # PyTorch is not yet supported in Python 3.12 as of the time I'm writing this # environment file. - - python>=3.8,<3.12 + - python>=3.8,<3.15 - pip # Not imported directly, but we force this version to avoid this issue: diff --git a/envs/environment-detector.yml b/envs/environment-detector.yml index 24ffe35a..b7bfca83 100644 --- a/envs/environment-detector.yml +++ b/envs/environment-detector.yml @@ -12,9 +12,7 @@ dependencies: # Only install the nomkl package in the M1 environment file # - nomkl - # PyTorch is not yet supported in Python 3.12 as of the time I'm writing this - # environment file. - - python>=3.8,<3.12 + - python>=3.8,<3.15 - pip # Not imported directly, but we force this version to avoid this issue: diff --git a/envs/environment.yml b/envs/environment.yml index df2b222e..4fb2b54c 100644 --- a/envs/environment.yml +++ b/envs/environment.yml @@ -8,9 +8,7 @@ channels: - nvidia dependencies: - # PyTorch is not yet supported in Python 3.12 as of the time I'm writing this - # environment file. - - python>=3.8,<3.12 + - python>=3.8,<3.15 # Not imported directly, but we force this version to avoid this issue: # diff --git a/pyproject-utils.toml b/pyproject-utils.toml index 2b96670d..880b0765 100644 --- a/pyproject-utils.toml +++ b/pyproject-utils.toml @@ -8,7 +8,7 @@ name = "megadetector-utils" version = "10.0.17" description = "Utility code associated with the MegaDetector project." readme = "README-package-utils.md" -requires-python = ">=3.9,<3.14" +requires-python = ">=3.9,<3.15" license = "MIT" keywords = ["camera traps", "conservation", "wildlife", "ai", "megadetector"] authors = [ diff --git a/pyproject.toml b/pyproject.toml index 37a21bf8..8a652910 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ name = "megadetector" version = "10.0.17" description = "MegaDetector is an AI model that helps conservation folks spend less time doing boring things with camera trap images." readme = "README-package.md" -requires-python = ">=3.9,<3.14" +requires-python = ">=3.9,<3.15" license = "MIT" keywords = ["camera traps", "conservation", "wildlife", "ai", "megadetector"] authors = [ @@ -36,7 +36,8 @@ dependencies = [ # numpy >= 1.26.4 is required for python >= 3.12 # # "numpy >= 1.26.4, < 2.0", - "numpy >= 1.26.4", + "numpy>=1.26.4; python_version < '3.14'", + "numpy>=1.26.4,<2.0; python_version >= '3.14'", # ultralytics-yolov5 has a dependency on FreeTypeFont.getsize(), which was # removed in Pillow 10. Restrict to <10.0 if you want to use val.py from # ultralytics-yolov5.