diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4d0a566..5e2b474 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,7 +10,7 @@ jobs: test: strategy: matrix: - python: ["3.7", "3.8", "3.9", "3.10"] + python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] runs-on: ubuntu-20.04 steps: diff --git a/daiquiri/formatter.py b/daiquiri/formatter.py index 0a8970a..4835587 100644 --- a/daiquiri/formatter.py +++ b/daiquiri/formatter.py @@ -157,9 +157,9 @@ def format(self, record: logging.LogRecord) -> str: return s -class DatadogFormatter(jsonlogger.JsonFormatter): # type: ignore[misc] +class DatadogFormatter(jsonlogger.JsonFormatter): def __init__(self) -> None: - super(DatadogFormatter, self).__init__(timestamp=True) + super(DatadogFormatter, self).__init__(timestamp=True) # type: ignore def add_fields( self, @@ -183,5 +183,5 @@ def add_fields( TEXT_FORMATTER = ColorExtrasFormatter(fmt=DEFAULT_EXTRAS_FORMAT) -JSON_FORMATTER = jsonlogger.JsonFormatter() +JSON_FORMATTER = jsonlogger.JsonFormatter() # type: ignore DATADOG_FORMATTER = DatadogFormatter() diff --git a/setup.cfg b/setup.cfg index 0095135..570bb16 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,6 +18,8 @@ classifier = Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 [options] install_requires = diff --git a/tox.ini b/tox.ini index e991e0f..e59784f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] -envlist = py37,py38,py39,p310,pep8,docs +envlist = py37,py38,py39,p310,py311,py312,pep8,docs [testenv] -whitelist_externals = sh +allowlist_externals = sh deps = -e.[test] commands = pytest {posargs} @@ -10,7 +10,7 @@ commands = sh -c "rm errors.log everything.log" [testenv:pep8] -basepython = python3.10 +basepython = python3.12 deps = {[testenv]deps} black @@ -37,4 +37,4 @@ ignore = E203,E501,W503,E231,A003,D101,D102,D103,D104,D105,D107,A003,D100 [testenv:docs] deps = sphinx -commands = python setup.py build_sphinx \ No newline at end of file +commands = sphinx-build -b html doc/source doc/build/html