Skip to content

Commit e65a7ec

Browse files
committed
Fix rq instrumentation, change tox deps
1 parent 97f4100 commit e65a7ec

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
matrix:
1717
os: [ ubuntu-22.04 ]
18-
python: ['3.10', '3.11', '3.12', '3.13']
18+
python: ['3.10']
1919
manylinux_image: [ manylinux2014, manylinux_2_28 ]
2020
# Disable for platforms where pure Python wheels would be generated
2121
cibw_skip: [ "pp310-* pp311-* pp312-* pp313-*" ]

src/scout_apm/rq.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ def wrap_perform(wrapped, instance, args, kwargs):
7373
# assumption here.
7474
if instance.enqueued_at.tzinfo is None:
7575
queued_at = instance.enqueued_at.replace(tzinfo=dt.timezone.utc)
76+
else:
77+
queued_at = instance.enqueued_at
7678
queue_time = (dt.datetime.now(dt.timezone.utc) - queued_at).total_seconds()
7779
tracked_request.tag("queue_time", queue_time)
7880
operation = "Job/{}".format(instance.func_name)

tox.ini

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[tox]
22
isolated_build = True
33
envlist =
4-
{py38,py39,py310,py311,py312}-django{40,41,42},
5-
{py310,py311,py312}-django{50a},
4+
{py39,py310,py311,py312,py313}-django{40,41,42},
5+
{py310,py311,py312,py313}-django{52},
66
[testenv]
77
passenv =
88
ELASTICSEARCH_URL
@@ -46,14 +46,13 @@ deps =
4646
redis
4747
rq
4848
six
49-
sqlalchemy < 2.0.0 ; python_version <= "3.8"
5049
sqlalchemy
5150
starlette
5251
webtest
5352
commands =
5453
pytest {posargs}
5554

5655
# For newer versions of python use --asyncio-mode=auto usage.
57-
[testenv:py{38,39,310,311}-django{40,41,42}]
56+
[testenv:py{310,311,312,313}-django{42,52}]
5857
commands =
5958
pytest {posargs} --asyncio-mode=auto

0 commit comments

Comments
 (0)