diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee15d7c..1b2e2a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,10 +25,10 @@ jobs: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.11' cache: 'pip' - name: Install Hatch @@ -58,7 +58,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy3.9', 'pypy3.10'] + python-version: [ '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy3.9', 'pypy3.10'] steps: - @@ -113,10 +113,10 @@ jobs: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.11' cache: 'pip' - name: Install Hatch diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cb10f8..689102e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Breaking Change + +- Dropped support for Python 3.8 ([#36](https://github.com/stumpylog/tika-client/pull/36)) + ### Fixed - Tests failed when run with Tika v3 ([#28](https://github.com/stumpylog/tika-client/pull/28)) diff --git a/pyproject.toml b/pyproject.toml index cfbfd7e..bba1730 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ license = "MPL-2.0" authors = [ { name = "Trenton H", email = "rda0128ou@mozmail.com" }, ] -requires-python = ">=3.8" +requires-python = ">=3.9" classifiers = [ "Development Status :: 4 - Beta", "Environment :: Web Environment", @@ -25,7 +25,6 @@ classifiers = [ "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", @@ -36,8 +35,7 @@ classifiers = [ ] dynamic = [ "version" ] dependencies = [ - "httpx~=0.24; python_version<'3.9'", - "httpx~=0.27; python_version>='3.9'", + "httpx~=0.28", "typing-extensions; python_version<'3.11'", ] @@ -74,8 +72,7 @@ randomize = true dependencies = [ "coverage-enable-subprocess == 1.0", "coverage[toml] ~= 7.6", - "pytest < 8.0; python_version < '3.9'", - "pytest ~= 8.3; python_version >= '3.9'", + "pytest ~= 8.3", "pytest-mock ~= 3.14", "pytest-randomly ~= 3.15", "pytest-rerunfailures ~= 14.0", @@ -83,8 +80,7 @@ dependencies = [ ] extra-dependencies = [ "pytest-sugar", - "pytest-httpx == 0.30.0; python_version >= '3.9'", - "pytest-httpx ~= 0.22; python_version < '3.9'", + "pytest-httpx ~= 0.33", "python-magic", "pytest-docker ~= 3.1", ] @@ -109,7 +105,7 @@ cov-report = [ ] [[tool.hatch.envs.hatch-test.matrix]] -python = [ "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.8", "pypy3.9", "pypy3.10" ] +python = [ "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.8", "pypy3.9", "pypy3.10" ] # # Custom Environments @@ -144,7 +140,7 @@ update = [ "pre-commit autoupdate" ] # [tool.ruff] -target-version = "py38" +target-version = "py39" line-length = 120 # https://docs.astral.sh/ruff/settings/ @@ -239,7 +235,7 @@ lint.isort.known-first-party = [ "tika_client" ] max_supported_python = "3.13" [tool.pytest.ini_options] -minversion = "7.0" +minversion = "8.0" testpaths = [ "tests" ] [tool.coverage.run] diff --git a/src/tika_client/__init__.py b/src/tika_client/__init__.py index 26ea4af..f635806 100644 --- a/src/tika_client/__init__.py +++ b/src/tika_client/__init__.py @@ -7,4 +7,4 @@ from tika_client.data_models import TikaKey from tika_client.data_models import XmpKey -__all__ = ["TikaClient", "TikaKey", "XmpKey", "DublinCoreKey"] +__all__ = ["DublinCoreKey", "TikaClient", "TikaKey", "XmpKey"] diff --git a/tests/conftest.py b/tests/conftest.py index e9789c2..eff7849 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,6 +1,6 @@ import logging +from collections.abc import Generator from pathlib import Path -from typing import Generator import pytest from pytest_docker.plugin import Services