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

Migrate to f40 #145

Merged
merged 2 commits into from
Aug 9, 2024
Merged

Migrate to f40 #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b71405
docker: migrate to fedora 40
nikromen Jul 29, 2024
b55a32f
backend: migrate to pydantic v2
nikromen Jul 29, 2024
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
20 changes: 10 additions & 10 deletions backend/src/schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from typing import Optional

from pydantic import AnyUrl, BaseModel, root_validator
from pydantic import AnyUrl, BaseModel, model_validator

from src.constants import BuildIdTitleEnum


def _check_spec_container_are_exclusively_mutual(_, values):
def _check_spec_container_are_exclusively_mutual(values):
spec_file = values.get("spec_file")
container_file = values.get("container_file")
if spec_file and container_file:
Expand Down Expand Up @@ -35,10 +35,10 @@ class ContributeResponseSchema(BaseModel):
spec_file: Optional[NameContentSchema] = None
container_file: Optional[NameContentSchema] = None

# validators
_normalize_spec_and_container_file = root_validator(pre=True, allow_reuse=True)(
_check_spec_container_are_exclusively_mutual
)
@model_validator(mode="before")
@classmethod
def _verify_spec_and_container_file(cls, values):
return _check_spec_container_are_exclusively_mutual(values)


class SnippetSchema(BaseModel):
Expand Down Expand Up @@ -82,10 +82,10 @@ class _WithoutLogsSchema(BaseModel):
spec_file: Optional[NameContentSchema] = None
container_file: Optional[NameContentSchema] = None

# validators
_normalize_spec_and_container_file = root_validator(pre=True, allow_reuse=True)(
_check_spec_container_are_exclusively_mutual
)
@model_validator(mode="before")
@classmethod
def _verify_spec_and_container_file(cls, values):
return _check_spec_container_are_exclusively_mutual(values)


class FeedbackInputSchema(_WithoutLogsSchema):
Expand Down
2 changes: 1 addition & 1 deletion docker/backend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.fedoraproject.org/fedora:38
FROM registry.fedoraproject.org/fedora:40
LABEL maintainer="[email protected]"

RUN dnf -y update && \
Expand Down
2 changes: 1 addition & 1 deletion docker/frontend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.fedoraproject.org/fedora:38
FROM registry.fedoraproject.org/fedora:40
LABEL maintainer="[email protected]"

RUN dnf -y update && \
Expand Down
4 changes: 2 additions & 2 deletions docker/production/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.fedoraproject.org/fedora:38
FROM registry.fedoraproject.org/fedora:40
LABEL maintainer="[email protected]"

ENV ENV=production
Expand All @@ -20,7 +20,7 @@ RUN npm install
RUN npm install -g shadow-cljs@">=2.26.0 <3.0.0"
RUN npx shadow-cljs release app

FROM registry.fedoraproject.org/fedora:38
FROM registry.fedoraproject.org/fedora:40
LABEL maintainer="[email protected]"

ENV ENV=production
Expand Down
Loading