Merge pull request #547 from pyinat/drop-37

Drop support for python 3.7
pyinat · Jan 29, 2024 · a7ec69b · a7ec69b
2 parents 613209c + 7d5a878
commit a7ec69b
Show file tree

Hide file tree

Showing 10 changed files with 706 additions and 768 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
 
     steps:
       - uses: actions/checkout@v4
@@ -28,7 +28,6 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - uses: snok/[email protected]
         with:
-          version: '1.5.1'  # For python 3.7 compatibility
           virtualenvs-in-project: true
 
       # Cache packages per python version, and reuse until lockfile changes

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -29,7 +29,6 @@ jobs:
           python-version: ${{ env.LATEST_PY_VERSION }}
       - uses: snok/[email protected]
         with:
-          version: '1.5.1'  # For python 3.7 compatibility
           virtualenvs-in-project: true
 
       - name: Set pre-release version

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,13 +8,13 @@ repos:
       - id: mixed-line-ending
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.7
+    rev: v0.1.14
     hooks:
       - id: ruff
         args: [ --fix ]
       - id: ruff-format
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.6.1
+    rev: v1.8.0
     hooks:
       - id: mypy
         additional_dependencies: [attrs, types-python-dateutil, types-requests, types-ujson]

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Nicolas Noé, Jordan Cook
+Copyright (c) 2024 Jordan Cook
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/docs/conf.py b/docs/conf.py
@@ -43,10 +43,9 @@
 NOTEBOOK_DIR_COPY = join(DOCS_DIR, 'examples')
 
 # General information about the project.
-copyright = '2022, Nicolas Noé, Jordan Cook'
 exclude_patterns = ['_build', f'{MODULE_DOCS_DIR}/pyinaturalist.rst']
 master_doc = 'index'
-needs_sphinx = '4.0'
+needs_sphinx = '5.0'
 project = 'pyinaturalist'
 source_suffix = ['.rst', '.md']
 templates_path = ['_templates']

diff --git a/docs/user_guide/general.md b/docs/user_guide/general.md
@@ -31,14 +31,15 @@ See {ref}`contributing` for details on setup for local development.
 :::{dropdown} Python version compatibility
 :icon: info
 
-pyinaturalist currently requires **python 3.7+**. If you need to use an older version
+pyinaturalist currently requires **python 3.8+**. If you need to use an older version
 of python, here are the last compatible versions of pyinaturalist:
 
 * **python 2.7:** pyinaturalist 0.1
 * **python 3.4:** pyinaturalist 0.10
 * **python 3.5:** pyinaturalist 0.11
 * **python 3.6:** pyinaturalist 0.16
-* **python 3.7:** still supported, but expected to be dropped in a future release
+* **python 3.7:** pyinaturalist 0.19
+* **python 3.8:** supported, but expected to be dropped in v1.0
 :::
 
 ## Imports

diff --git a/noxfile.py b/noxfile.py
@@ -24,7 +24,7 @@
 ]
 
 
-@session(python=['3.7', '3.8', '3.9', '3.10', '3.11', '3.12'])
+@session(python=['3.8', '3.9', '3.10', '3.11', '3.12'])
 def test(session):
     """Run tests for a specific python version"""
     test_paths = session.posargs or ['test']

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyinaturalist/models/lazy_property.py b/pyinaturalist/models/lazy_property.py
@@ -1,6 +1,6 @@
 from functools import update_wrapper
 from inspect import signature
-from typing import Callable, Dict, List, Optional, Type
+from typing import Any, Callable, Dict, List, Optional, Type
 
 from attr import Attribute, Factory
 
@@ -66,7 +66,7 @@ def __init__(
         update_wrapper(self, converter)
         self.converter = converter
         self.converter_kwargs = converter_kwargs
-        self.default = None
+        self.default: Any = None
         self.type = type
         self.__doc__ = doc
         self.__set_name__(None, name)

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,8 +1,8 @@
 [tool.poetry]
 name = "pyinaturalist"
-version = "0.19.0"
+version = "0.20.0"
 description = "iNaturalist API client for python"
-authors = ["Jordan Cook <[email protected]>"]
+authors = ["Jordan Cook"]
 license = "MIT"
 readme = "README.md"
 homepage = "https://github.com/pyinat/pyinaturalist"
@@ -40,7 +40,7 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python                      = "^3.7"
+python                      = "^3.8"
 attrs                       = ">=21.2"
 keyring                     = ">=22.3"
 platformdirs                = ">=2.6"
@@ -51,30 +51,24 @@ requests-cache              = ">=1.1"
 requests-ratelimiter        = ">=0.3.2"
 rich                        = ">=10.9"
 
-# Workaround for package conflicts on python 3.7; required for rich
-markdown-it-py              = [
-                                {python="3.7", version="2.2"},
-                                {python=">=3.8", version=">=3.0"},
-                              ]
-
 # Optional dependencies
 ujson                       = {optional=true, version=">5.0"}
 
 # Documentation dependencies needed for Readthedocs builds
-furo                        = {optional=true, python=">=3.8", version="^2023.7"}
-ipython                     = {optional=true, python=">=3.8", version="^8.12"}
-linkify-it-py               = {optional=true, python=">=3.8", version="^2.0"}
-matplotlib                  = {optional=true, python=">=3.8", version=">=3.7"}
-myst-parser                 = {optional=true, python=">=3.8", version=">=1.0"}
-nbsphinx                    = {optional=true, python=">=3.8", version="^0.9"}
-pillow                      = {optional=true, python=">=3.8", version=">=10.1"}
-sphinx                      = {optional=true, python=">=3.8", version="^6.2"}
-sphinx-automodapi           = {optional=true, python=">=3.8", version="^0.15"}
-sphinx-autodoc-typehints    = {optional=true, python=">=3.8", version="1.20"}
-sphinx-copybutton           = {optional=true, python=">=3.8", version=">=0.5"}
-sphinx-design               = {optional=true, python=">=3.8", version=">=0.5"}
-sphinxcontrib-apidoc        = {optional=true, python=">=3.8", version="^0.3"}
-sphinxext-opengraph         = {optional=true, python=">=3.8", version=">=0.9"}
+furo                        = {optional=true, version="^2023.7"}
+ipython                     = {optional=true, version="^8.12"}
+linkify-it-py               = {optional=true, version="^2.0"}
+matplotlib                  = {optional=true, version=">=3.7"}
+myst-parser                 = {optional=true, version=">=1.0"}
+nbsphinx                    = {optional=true, version="^0.9"}
+pillow                      = {optional=true, version=">=10.1"}
+sphinx                      = {optional=true, version="^6.2"}
+sphinx-automodapi           = {optional=true, version="^0.15"}
+sphinx-autodoc-typehints    = {optional=true, version="1.20"}
+sphinx-copybutton           = {optional=true, version=">=0.5"}
+sphinx-design               = {optional=true, version=">=0.5"}
+sphinxcontrib-apidoc        = {optional=true, version="^0.3"}
+sphinxext-opengraph         = {optional=true, version=">=0.9"}
 
 [tool.poetry.dev-dependencies]
 coverage                    = ">=7.2"
@@ -87,7 +81,7 @@ pytest-asyncio              = ">=0.21"
 pytest-cov                  = ">=3.0"
 pytest-xdist                = ">=2.2"
 requests-mock               = "^1.8"
-sphinx-autobuild            = {python=">=3.8", version=">=2021.3"}
+sphinx-autobuild            = ">=2021.3"
 
 [tool.poetry.extras]
 all = ["ujson"]