Skip to content

Commit 9020b03

Browse files
committed
Remove pydantic-settings as a dependency
Use dotenv instead of pydantic-settings for loading environment variables from .env file Signed-off-by: Devansh Singh <devanshamity@gmail.com>
1 parent 84b6f61 commit 9020b03

File tree

7 files changed

+23
-64
lines changed

7 files changed

+23
-64
lines changed

setup.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ install_requires =
5454
gunicorn
5555
httpx
5656
itsdangerous
57-
pydantic-settings
5857
python-dotenv
5958
teuthology @ git+https://github.com/ceph/teuthology#egg=teuthology[test]
6059

src/teuthology_api/config.py

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

src/teuthology_api/main.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22
import os
33
from fastapi import FastAPI, Request
44
from fastapi.middleware.cors import CORSMiddleware
5+
from dotenv import load_dotenv
56
from starlette.middleware.sessions import SessionMiddleware
67

7-
from teuthology_api.config import settings
88
from teuthology_api.routes import suite, kill, login, logout
99

10+
load_dotenv()
1011

11-
DEPLOYMENT = settings.deployment
12-
SESSION_SECRET_KEY = settings.session_secret_key
13-
PULPITO_URL = settings.pulpito_url
14-
PADDLES_URL = settings.paddles_url
12+
DEPLOYMENT = os.getenv("DEPLOYMENT")
13+
SESSION_SECRET_KEY = os.getenv("SESSION_SECRET_KEY")
14+
PULPITO_URL = os.getenv("PULPITO_URL")
15+
PADDLES_URL = os.getenv("PADDLES_URL")
1516

1617
log = logging.getLogger(__name__)
1718
app = FastAPI()

src/teuthology_api/routes/login.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22
import os
33
from fastapi import APIRouter, HTTPException, Request
44
from fastapi.responses import RedirectResponse
5+
from dotenv import load_dotenv
56
import httpx
6-
from teuthology_api.config import settings
77

8+
load_dotenv()
89

9-
GH_CLIENT_ID = settings.gh_client_id
10-
GH_CLIENT_SECRET = settings.gh_client_secret
11-
GH_AUTHORIZATION_BASE_URL = settings.gh_authorization_base_url
12-
GH_TOKEN_URL = settings.gh_token_url
13-
GH_FETCH_MEMBERSHIP_URL = settings.gh_fetch_membership_url
14-
PULPITO_URL = settings.pulpito_url
10+
GH_CLIENT_ID = os.getenv("GH_CLIENT_ID")
11+
GH_CLIENT_SECRET = os.getenv("GH_CLIENT_SECRET")
12+
GH_AUTHORIZATION_BASE_URL = os.getenv("GH_AUTHORIZATION_BASE_URL")
13+
GH_TOKEN_URL = os.getenv("GH_TOKEN_URL")
14+
GH_FETCH_MEMBERSHIP_URL = os.getenv("GH_FETCH_MEMBERSHIP_URL")
15+
PULPITO_URL = os.getenv("PULPITO_URL")
1516

1617
log = logging.getLogger(__name__)
1718
router = APIRouter(

src/teuthology_api/routes/logout.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import logging
2+
import os
23
from fastapi import APIRouter, HTTPException, Request
34
from fastapi.responses import RedirectResponse
4-
from teuthology_api.config import settings
55

6-
PULPITO_URL = settings.pulpito_url
6+
PULPITO_URL = os.getenv("PULPITO_URL")
77
log = logging.getLogger(__name__)
88

99
router = APIRouter(

src/teuthology_api/services/helpers.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@
55
from pathlib import Path
66

77
from fastapi import HTTPException, Request
8-
9-
from teuthology_api.config import settings
8+
from dotenv import load_dotenv
109

1110
import teuthology
1211
import requests # Note: import requests after teuthology
1312
from requests.exceptions import HTTPError
1413

15-
PADDLES_URL = settings.paddles_url
16-
ARCHIVE_DIR = settings.archive_dir
14+
load_dotenv()
15+
16+
PADDLES_URL = os.getenv("PADDLES_URL")
17+
ARCHIVE_DIR = os.getenv("ARCHIVE_DIR")
1718

1819
log = logging.getLogger(__name__)
1920

src/teuthology_api/services/kill.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import logging
2+
import os
23
import subprocess
34

45
from fastapi import HTTPException, Request
56

6-
from teuthology_api.config import settings
77
from teuthology_api.services.helpers import get_username, get_run_details
88

99

10-
TEUTHOLOGY_PATH = settings.teuthology_path
10+
TEUTHOLOGY_PATH = os.getenv("TEUTHOLOGY_PATH")
1111
log = logging.getLogger(__name__)
1212

1313

0 commit comments

Comments
 (0)