Skip to content

Commit

Permalink
feat(docker): update python to v3.12
Browse files Browse the repository at this point in the history
  • Loading branch information
anehx committed May 30, 2024
1 parent 176cb96 commit 14c4d7f
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ updates:
ignore:
- dependency-name: python
versions:
- ">= 3.7"
- ">=3.12"
- package-ecosystem: github-actions
directory: "/"
schedule:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ jobs:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
database:
- "sqlite"
- "postgres"
Expand Down
9 changes: 6 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8
FROM python:3.12-slim

LABEL org.opencontainers.image.source=https://github.com/adfinis/document-merge-service
LABEL org.opencontainers.image.description="Merge Document Template Service"
Expand Down Expand Up @@ -30,9 +30,12 @@ WORKDIR $APP_HOME
RUN \
--mount=type=cache,target=/var/cache/apt \
apt-get update && apt-get install -y --no-install-recommends \
util-linux \
unoconv \
build-essential \
default-libmysqlclient-dev \
libreoffice-writer \
pkg-config \
unoconv \
util-linux \
wait-for-it \
&& rm -rf /var/lib/apt/lists/*

Expand Down
4 changes: 2 additions & 2 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 21 additions & 10 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,22 @@ classifiers = [
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
"Programming Language :: Python :: 3",
"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",
"Framework :: Django :: 4",
"Framework :: Django :: 4.2",
]
include = ["CHANGELOG.md"]
exclude = [
"document-merge-service/**/tests",
]

[tool.poetry.dependencies]
python = "^3.8.1"
python = ">=3.8.1,<3.13"
Babel = "^2.15.0"
Django = "~4.2.13"
django-cors-headers = "^4.3.1"
Expand Down Expand Up @@ -94,15 +101,19 @@ line_length = 88
[tool.pytest.ini_options]
addopts = "--reuse-db --randomly-seed=1521188766 --randomly-dont-reorganize"
DJANGO_SETTINGS_MODULE = "document_merge_service.settings"
filterwarnings = """
error::DeprecationWarning
error::PendingDeprecationWarning
ignore:invalid escape sequence
ignore:pkg_resources is deprecated as an API:DeprecationWarning"""
env = """
ADMINS=Test Example <test@example.com>,Test2 <test2@example.com>
OIDC_USERINFO_ENDPOINT=mock://document-merge-service.github.com/openid/userinfo
OIDC_BEARER_TOKEN_REVALIDATION_TIME=60"""
filterwarnings = [
"error::DeprecationWarning",
"error::PendingDeprecationWarning",
"ignore:invalid escape sequence",
"ignore:pkg_resources is deprecated as an API:DeprecationWarning",
"ignore:'imghdr' is deprecated:DeprecationWarning",
"ignore:datetime.datetime.utcnow():DeprecationWarning"
]
env = [
"ADMINS=Test Example <test@example.com>,Test2 <test2@example.com>",
"OIDC_USERINFO_ENDPOINT=mock://document-merge-service.github.com/openid/userinfo",
"OIDC_BEARER_TOKEN_REVALIDATION_TIME=60"
]

[tool.coverage.run]
source = ["."]
Expand Down

0 comments on commit 14c4d7f

Please sign in to comment.