Skip to content

Commit 60aa83c

Browse files
authored
Merge pull request #287 from CLIMB-TRE/development
`v0.20.8`
2 parents ccc0fac + 15171a7 commit 60aa83c

21 files changed

Lines changed: 1812 additions & 253 deletions

.github/workflows/test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ jobs:
5252
DATABASE_USER: postgres
5353
DATABASE_PASSWORD: postgres
5454
DATABASE_HOST: localhost
55-
ONYX_PROJECTS: testproject
5655
working-directory: ./onyx
5756
run: |
5857
poetry run coverage run --rcfile=../pyproject.toml manage.py test -v 2

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
.coverage
66
.stuff
77
.prettierignore
8+
.python-version
89
**.log
910
__pycache__
1011
onyx/projects/*

docs/backend/permissions.md

Lines changed: 0 additions & 135 deletions
This file was deleted.

docs/backend/server_control.md

Lines changed: 0 additions & 21 deletions
This file was deleted.

docs/backend/tests.md

Lines changed: 0 additions & 41 deletions
This file was deleted.

onyx/.env.example

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,5 @@ GUNICORN_WORKERS = 8
77
# Postgres
88
DATABASE_NAME = "db_name"
99
DATABASE_USER = "db_user"
10-
# Projects
11-
ONYX_PROJECTS = "testproject"
1210
# CORS Allowed Origins
1311
CORS_ALLOWED_ORIGINS = "http://localhost:5173"

onyx/data/management/commands/project.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import sys
12
import json
23
from typing import Optional, List, Dict
34
from pydantic import BaseModel, field_validator
@@ -36,7 +37,11 @@ class GroupConfig(BaseModel):
3637

3738
@field_validator("scope")
3839
def validate_scope(cls, value):
39-
assert value in SCOPE_LABELS, f"Invalid scope: {value}"
40+
if value not in SCOPE_LABELS:
41+
print(
42+
f"NOTE: Scope '{value}' is not in the list of default scopes: {SCOPE_LABELS}.",
43+
file=sys.stderr,
44+
)
4045
return value
4146

4247
@field_validator("object_type")

0 commit comments

Comments
 (0)