From c2b0a60c56b37a3ea76b7bb70a7ee268bf21fb9b Mon Sep 17 00:00:00 2001 From: Romain Hugonnet Date: Wed, 30 Oct 2024 14:33:45 -0700 Subject: [PATCH] Add Python 3.12 support (#618) --- .github/workflows/pip-checks.yml | 2 +- .github/workflows/python-publish.yml | 2 +- .github/workflows/python-tests.yml | 2 +- CONTRIBUTING.md | 2 +- dev-environment.yml | 2 +- environment.yml | 2 +- pyproject.toml | 2 +- setup.cfg | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pip-checks.yml b/.github/workflows/pip-checks.yml index b51b00e6..57b778cb 100644 --- a/.github/workflows/pip-checks.yml +++ b/.github/workflows/pip-checks.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: os: ["ubuntu-latest", "macos-latest", "windows-latest"] - python-version: ["3.9", "3.10", "3.11"] + python-version: ["3.10", "3.11", "3.12"] # Run all shells using bash (including Windows) defaults: diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index efe7bdb3..3fa42996 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -25,7 +25,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: '3.12' - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index 749bf5d2..baf1f760 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: os: ["ubuntu-latest", "macos-latest", "windows-latest"] - python-version: ["3.9", "3.10", "3.11"] + python-version: ["3.10", "3.11", "3.12"] defaults: run: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 747e4b27..bb3d51bb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ For more details, see the rest of this document. ## Development environment -GeoUtils currently supports only Python versions of 3.9 and higher, see `environment.yml` for detailed dependencies. +GeoUtils currently supports only Python versions of 3.10 to 3.12, see `environment.yml` for detailed dependencies. ### Setup diff --git a/dev-environment.yml b/dev-environment.yml index 15c79b7c..b3a2d66f 100644 --- a/dev-environment.yml +++ b/dev-environment.yml @@ -2,7 +2,7 @@ name: geoutils-dev channels: - conda-forge dependencies: - - python>=3.9,<3.12 + - python>=3.10,<3.13 - geopandas>=0.12.0 - matplotlib=3.* - pyproj=3.* diff --git a/environment.yml b/environment.yml index 92daeaba..bee5d975 100644 --- a/environment.yml +++ b/environment.yml @@ -2,7 +2,7 @@ name: geoutils channels: - conda-forge dependencies: - - python>=3.9,<3.12 + - python>=3.10,<3.13 - geopandas>=0.12.0 - matplotlib=3.* - pyproj=3.* diff --git a/pyproject.toml b/pyproject.toml index 9b3f2de2..1af72ae5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ version_file = "geoutils/_version.py" fallback_version = "0.0.1" [tool.black] -target_version = ['py36'] +target_version = ['py310'] [tool.pytest.ini_options] addopts = "--doctest-modules -W error::UserWarning" diff --git a/setup.cfg b/setup.cfg index c6db8b19..2c927a75 100644 --- a/setup.cfg +++ b/setup.cfg @@ -34,7 +34,7 @@ packages = find: scripts = bin/geoviewer.py zip_safe = False # https://mypy.readthedocs.io/en/stable/installed_packages.html include_package_data = True -python_requires = >=3.9,<3.13 +python_requires = >=3.10,<3.13 # Avoid pinning dependencies in requirements.txt (which we don't do anyways, and we rely mostly on Conda) # (https://caremad.io/posts/2013/07/setup-vs-requirement/, https://github.com/pypa/setuptools/issues/1951) install_requires = file: requirements.txt