Skip to content

Commit b930457

Browse files
authored
Merge branch 'master' into feature/lims-1842/alert-lcs
2 parents 1a1252b + e5f98c0 commit b930457

File tree

4 files changed

+25
-18
lines changed

4 files changed

+25
-18
lines changed

CHANGELOG.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ All notable changes to this project will be documented in this file.
77
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
88
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
99

10+
+++++++++
11+
v0.14.2 (05/09/2025)
12+
+++++++++
13+
14+
**Changed**
15+
16+
- Update dependencies
17+
1018
+++++++++
1119
v0.14.1 (01/08/2025)
1220
+++++++++

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# The devcontainer should use the build target and run as root with podman
44
# or docker with user namespaces.
55
#
6-
FROM docker.io/library/python:3.13.1-slim-bookworm as build
6+
FROM docker.io/library/python:3.13.7-slim-bookworm as build
77

88
# Add any system dependencies for the developer/build environment here
99
RUN apt-get update && apt-get upgrade -y && \
@@ -37,7 +37,7 @@ RUN pip install --upgrade pip && \
3737
# and replace with a comment to avoid a zero length asset upload later
3838
sed -i '/file:/s/^/# Requirements for /' lockfiles/requirements.txt
3939

40-
FROM docker.io/library/python:3.13.1-slim-bookworm as runtime
40+
FROM docker.io/library/python:3.13.7-slim-bookworm as runtime
4141

4242
RUN adduser --system --no-create-home --uid 1001 nonroot
4343

pyproject.toml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,53 +5,51 @@ build-backend = "setuptools.build_meta"
55
[project]
66
name = "scaup"
77
classifiers = [
8-
"Development Status :: 3 - Alpha",
8+
"Development Status :: 3 - Beta",
99
"License :: OSI Approved :: Apache Software License",
10-
"Programming Language :: Python :: 3.10",
1110
"Programming Language :: Python :: 3.11",
12-
"Programming Language :: Python :: 3.12"
11+
"Programming Language :: Python :: 3.12",
12+
"Programming Language :: Python :: 3.13"
1313
]
1414
description = "Scaup's backend"
1515

1616
dependencies = [
1717
"SQLAlchemy~=2.0.36",
18-
"APScheduler~=3.11.0",
19-
"fastapi~=0.115.6",
20-
"psycopg[binary,pool]~=3.2.3",
21-
"pydantic~=2.10.5",
22-
"uvicorn~=0.34.0",
18+
"fastapi~=0.116.1",
19+
"psycopg[binary,pool]~=3.2.9",
20+
"pydantic~=2.11.7",
21+
"uvicorn~=0.35.0",
2322
"types-requests",
2423
"lims_utils~=0.4.2",
2524
"requests",
26-
"fpdf2~=2.8.2",
27-
"qrcode~=8.0.0",
25+
"fpdf2~=2.8.4",
26+
"qrcode~=8.2.0",
2827
"pyjwt[crypto]~=2.10.1",
2928
"alembic"
3029
]
3130
dynamic = ["version"]
3231
license.file = "LICENSE"
3332
readme = "README.rst"
34-
requires-python = ">=3.10"
33+
requires-python = ">=3.11"
3534

3635
[project.optional-dependencies]
3736
dev = [
3837
"black",
3938
"mypy",
4039
"pipdeptree",
4140
"pre-commit",
42-
"pytest~=8.3.5",
41+
"pytest~=8.4.1",
4342
"pytest-cov",
4443
"ruff",
45-
"freezegun~=1.5.2",
44+
"freezegun~=1.5.5",
4645
"sphinx-autobuild",
4746
"sphinx-copybutton",
4847
"sphinx-design",
4948
"tox-direct",
5049
"types-mock",
5150
"pytest-asyncio",
5251
"responses",
53-
# https://github.com/encode/httpx/blob/master/CHANGELOG.md#0270-21st-february-2024
54-
"httpx~=0.26.0"
52+
"httpx~=0.28.1"
5553
]
5654

5755
[project.scripts]
@@ -66,7 +64,7 @@ name = "Guilherme de Freitas"
6664

6765
[tool.setuptools_scm]
6866
write_to = "src/scaup/_version.py"
69-
fallback_version = "0.6.0"
67+
fallback_version = "0.15.0"
7068

7169
[tool.mypy]
7270
ignore_missing_imports = true # Ignore missing stubs in imported modules

tests/utils/external/test_status.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ def test_upstream_failure(client, caplog):
8787
)
8888

8989

90+
@freeze_time("2025-06-05 15:28:42.285 +0100")
9091
@responses.activate
9192
def test_multiple_shipments(client):
9293
"""Should update statuses for multiple shipments"""

0 commit comments

Comments
 (0)