Skip to content

Commit

Permalink
stash
Browse files Browse the repository at this point in the history
  • Loading branch information
jsstevenson committed Jan 3, 2025
1 parent fcd2d97 commit 191c7c7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
11 changes: 1 addition & 10 deletions src/gene/database/database.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
import abc
import sys
from collections.abc import Generator
from enum import Enum
from os import environ
from pathlib import Path
from typing import Any

import click

from gene.schemas import RecordType, RefType, SourceMeta, SourceName
from gene.schemas import AwsEnvName, RecordType, RefType, SourceMeta, SourceName


class DatabaseException(Exception): # noqa: N818
Expand Down Expand Up @@ -250,14 +249,6 @@ def export_db(self, export_location: Path) -> None:
SKIP_AWS_DB_ENV_NAME = "SKIP_AWS_CONFIRMATION"


class AwsEnvName(str, Enum):
"""AWS environment name that is being used"""

DEVELOPMENT = "Dev"
STAGING = "Staging"
PRODUCTION = "Prod"


VALID_AWS_ENV_NAMES = {v.value for v in AwsEnvName.__members__.values()}


Expand Down
9 changes: 8 additions & 1 deletion src/gene/schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
)

from gene import __version__
from gene.database.database import AwsEnvName

CURIE_REGEX = r"^\w[^:]*:.+$"

Expand Down Expand Up @@ -747,6 +746,14 @@ class ServiceType(BaseModel):
version: Literal[__version__] = __version__


class AwsEnvName(str, Enum):
"""AWS environment name that is being used"""

DEVELOPMENT = "Dev"
STAGING = "Staging"
PRODUCTION = "Prod"


class ServiceInfo(BaseModel):
"""Define response structure for GA4GH /service_info endpoint."""

Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def database() -> AbstractDatabase:

def pytest_addoption(parser):
"""Add custom commands to pytest invocation.
See https://docs.pytest.org/en/7.1.x/reference/reference.html#parser
See https://docs.pytest.org/en/8.1.x/reference/reference.html#parser
"""
parser.addoption(
"--verbose-logs",
Expand Down

0 comments on commit 191c7c7

Please sign in to comment.