JOJ/JOJ3-config-generator
27
1
Fork 0
Code Issues 3 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: JOJ:d8073e4eb6ae2c2717ee9678aada7f6b1ff43549
Branches Tags
JOJ:master
JOJ:docs/README
..
compare: JOJ:b46bc950f796b1a32af61fe551f54b175d62fccb
Branches Tags
JOJ:master
JOJ:docs/README

No commits in common. "d8073e4eb6ae2c2717ee9678aada7f6b1ff43549" and "b46bc950f796b1a32af61fe551f54b175d62fccb" have entirely different histories.
d8073e4eb6 ... b46bc950f7

9 changed files with 9 additions and 21 deletions
Show Stats Expand all files Collapse all files

6
joj3_config_generator/models/repo.py
View File

@ -1,6 +1,6 @@
import os import os
from pathlib import Path from pathlib import Path
from typing import List from typing import List, Optional
from pydantic import AliasChoices, BaseModel, Field, model_validator from pydantic import AliasChoices, BaseModel, Field, model_validator
@ -32,8 +32,8 @@ class Config(BaseModel):
"", validation_alias=AliasChoices("gitea-token", "gitea_token") "", validation_alias=AliasChoices("gitea-token", "gitea_token")
) )
gitea_org: str = Field("", validation_alias=AliasChoices("gitea-org", "gitea_org")) gitea_org: str = Field("", validation_alias=AliasChoices("gitea-org", "gitea_org"))
max_total_score: int = Field( max_total_score: Optional[int] = Field(
100, validation_alias=AliasChoices("max-total-score", "max_total_score") None, validation_alias=AliasChoices("max-total-score", "max_total_score")
) )
force_skip_health_check_on_test: bool = Field( force_skip_health_check_on_test: bool = Field(
False, False,

6
joj3_config_generator/models/task.py
View File

@ -1,7 +1,7 @@
from datetime import datetime, timezone from datetime import datetime, timezone
from enum import Enum from enum import Enum
from pathlib import Path from pathlib import Path
from typing import Any, Dict, List, Optional, Type from typing import Any, Dict, List, Type
from pydantic import ( from pydantic import (
AliasChoices, AliasChoices,
@ -222,6 +222,6 @@ class Config(BaseModel):
release: Release = Release() # Release configuration release: Release = Release() # Release configuration
stages: List[Stage] = [] # list of stage configurations stages: List[Stage] = [] # list of stage configurations
groups: Groups = Groups() groups: Groups = Groups()
max_total_score: Optional[int] = Field( max_total_score: int = Field(
None, validation_alias=AliasChoices("max-total-score", "max_total_score") 100, validation_alias=AliasChoices("max-total-score", "max_total_score")
) )

6
joj3_config_generator/transformers/repo.py
View File

@ -33,9 +33,9 @@ def get_teapot_post_stage(
repo_conf.grading_repo_name, repo_conf.grading_repo_name,
"--max-total-score", "--max-total-score",
( (
str(task_conf.max_total_score) str(repo_conf.max_total_score)
if task_conf.max_total_score is not None if repo_conf.max_total_score is not None
else str(repo_conf.max_total_score) else str(task_conf.max_total_score)
), ),
] ]
if not repo_conf.submitter_in_issue_title: if not repo_conf.submitter_in_issue_title:

7
tests/convert/basic/task.json
View File

@ -261,7 +261,6 @@
{ {
"name": "keyword", "name": "keyword",
"with": { "with": {
"score": 0,
"matches": [ "matches": [
{ {
"keywords": [ "keywords": [
@ -370,7 +369,6 @@
{ {
"name": "clangtidy", "name": "clangtidy",
"with": { "with": {
"score": 0,
"matches": [ "matches": [
{ {
"keywords": [ "keywords": [
@ -501,14 +499,12 @@
{ {
"name": "keyword", "name": "keyword",
"with": { "with": {
"score": 0,
"matches": [] "matches": []
} }
}, },
{ {
"name": "cppcheck", "name": "cppcheck",
"with": { "with": {
"score": 0,
"matches": [ "matches": [
{ {
"keywords": [ "keywords": [
@ -531,7 +527,6 @@
{ {
"name": "clangtidy", "name": "clangtidy",
"with": { "with": {
"score": 0,
"matches": [] "matches": []
} }
}, },
@ -557,7 +552,6 @@
{ {
"name": "cpplint", "name": "cpplint",
"with": { "with": {
"score": 0,
"matches": [] "matches": []
} }
}, },
@ -658,7 +652,6 @@
{ {
"name": "cpplint", "name": "cpplint",
"with": { "with": {
"score": 0,
"matches": [ "matches": [
{ {
"keywords": [ "keywords": [

1
tests/convert/clang-tidy/task.json
View File

@ -78,7 +78,6 @@
{ {
"name": "clangtidy", "name": "clangtidy",
"with": { "with": {
"score": 0,
"matches": [ "matches": [
{ {
"keywords": [ "keywords": [

1
tests/convert/cppcheck/task.json
View File

@ -71,7 +71,6 @@
{ {
"name": "cppcheck", "name": "cppcheck",
"with": { "with": {
"score": 0,
"matches": [ "matches": [
{ {
"keywords": [ "keywords": [

1
tests/convert/cpplint/task.json
View File

@ -70,7 +70,6 @@
{ {
"name": "cpplint", "name": "cpplint",
"with": { "with": {
"score": 0,
"matches": [ "matches": [
{ {
"keywords": [ "keywords": [

1
tests/convert/elf/task.json
View File

@ -74,7 +74,6 @@
{ {
"name": "elf", "name": "elf",
"with": { "with": {
"score": 0,
"matches": [ "matches": [
{ {
"keywords": [ "keywords": [

1
tests/convert/keyword/task.json
View File

@ -73,7 +73,6 @@
{ {
"name": "keyword", "name": "keyword",
"with": { "with": {
"score": 0,
"matches": [ "matches": [
{ {
"keywords": [ "keywords": [