Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support up to Python 3.12 #74

Merged
merged 4 commits into from
Oct 19, 2023
Merged

Add support up to Python 3.12 #74

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
37510db
Add support of Python 3.12
jcapiitao Jul 18, 2023
070fdb9
Adjust tests for taskName attribute added in Python 3.12
jcapiitao Jul 18, 2023
66b7dea
Update .github/workflows/ci.yaml
sileht Oct 19, 2023
397ef7f
Update tox.ini
sileht Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
test:
strategy:
matrix:
python: ["3.8", "3.9", "3.10", "3.11"]
python: ["3.8", "3.9", "3.10", "3.11", "3.12"]

runs-on: ubuntu-22.04
steps:
Expand Down
2 changes: 2 additions & 0 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ queue_rules:
- "check-success=test (3.9)"
- "check-success=test (3.10)"
- "check-success=test (3.11)"
- "check-success=test (3.12)"
merge_conditions:
- "check-success=pep8"
- "check-success=test (3.8)"
- "check-success=test (3.9)"
- "check-success=test (3.10)"
- "check-success=test (3.11)"
- "check-success=test (3.12)"
16 changes: 11 additions & 5 deletions daiquiri/tests/test_daiquiri.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import io
import json
import logging
import sys
import typing
import unittest
import warnings

Expand Down Expand Up @@ -39,7 +41,10 @@ def test_setup_json_formatter(self) -> None:
)
)
daiquiri.getLogger(__name__).warning("foobar")
self.assertEqual({"message": "foobar"}, json.loads(stream.getvalue()))
expected: dict[str, typing.Any] = {"message": "foobar"}
if sys.version_info >= (3, 12):
expected.update({"taskName": None})
self.assertEqual(expected, json.loads(stream.getvalue()))

def test_setup_json_formatter_with_extras(self) -> None:
stream = io.StringIO()
Expand All @@ -51,9 +56,10 @@ def test_setup_json_formatter_with_extras(self) -> None:
)
)
daiquiri.getLogger(__name__).warning("foobar", foo="bar")
self.assertEqual(
{"message": "foobar", "foo": "bar"}, json.loads(stream.getvalue())
)
expected: dict[str, typing.Any] = {"message": "foobar", "foo": "bar"}
if sys.version_info >= (3, 12):
expected.update({"taskName": None})
self.assertEqual(expected, json.loads(stream.getvalue()))

def test_get_logger_set_level(self) -> None:
logger = daiquiri.getLogger(__name__)
Expand All @@ -66,7 +72,7 @@ def test_capture_warnings(self) -> None:
line = stream.getvalue()
self.assertIn("WARNING py.warnings: ", line)
self.assertIn(
"daiquiri/tests/test_daiquiri.py:65: "
"daiquiri/tests/test_daiquiri.py:71: "
'UserWarning: omg!\n warnings.warn("omg!")\n',
line,
)
Expand Down
68 changes: 32 additions & 36 deletions daiquiri/tests/test_output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
# under the License.
import json
import logging
import sys
import syslog
import typing
import unittest
Expand Down Expand Up @@ -100,6 +101,34 @@ def test_datadog(self) -> None:
logger = daiquiri.getLogger()
logger.error("foo", bar=1)
logger.info("bar")
expected_error_1 = {
"status": "error",
"message": "foo",
"bar": 1,
"logger": {"name": "root"},
"timestamp": mock.ANY,
}
expected_info_1 = {
"status": "info",
"message": "bar",
"logger": {"name": "root"},
"timestamp": mock.ANY,
}
expected_error_2 = {
"status": "error",
"message": "backtrace",
"logger": {"name": "saymyname"},
"timestamp": mock.ANY,
"error": {
"kind": "ZeroDivisionError",
"stack": None,
"message": mock.ANY,
},
}
if sys.version_info >= (3, 12):
expected_error_1.update({"taskName": None})
expected_info_1.update({"taskName": None})
expected_error_2.update({"taskName": None})
try:
1 / 0
except ZeroDivisionError:
Expand All @@ -108,41 +137,8 @@ def test_datadog(self) -> None:
socket_instance.connect.assert_called_once_with(("127.0.0.1", 10518))
socket_instance.sendall.assert_has_calls(
[
mock.call(
DatadogMatcher(
{
"status": "error",
"message": "foo",
"bar": 1,
"logger": {"name": "root"},
"timestamp": mock.ANY,
}
)
),
mock.call(
DatadogMatcher(
{
"status": "info",
"message": "bar",
"logger": {"name": "root"},
"timestamp": mock.ANY,
}
)
),
mock.call(
DatadogMatcher(
{
"status": "error",
"message": "backtrace",
"logger": {"name": "saymyname"},
"timestamp": mock.ANY,
"error": {
"kind": "ZeroDivisionError",
"stack": None,
"message": mock.ANY,
},
}
)
),
mock.call(DatadogMatcher(expected_error_1)),
mock.call(DatadogMatcher(expected_info_1)),
mock.call(DatadogMatcher(expected_error_2)),
]
)
1 change: 1 addition & 0 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ classifier =
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12

[options]
install_requires =
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py38,py39,py310,py311,pep8,docs
envlist = py38,py39,py310,py311,py312,pep8,docs

[testenv]
allowlist_externals = sh
Expand All @@ -10,7 +10,7 @@ commands =
sh -c "rm errors.log everything.log"

[testenv:pep8]
basepython = python3.10
basepython = python3.11
sileht marked this conversation as resolved.
Show resolved Hide resolved
deps =
{[testenv]deps}
black
Expand Down
Loading