Skip to content

Commit 60ca62b

Browse files
authored
Merge branch 'main' into fix/issue-641
2 parents d324005 + 6e6f868 commit 60ca62b

19 files changed

Lines changed: 2233 additions & 809 deletions

‎.github/workflows/ci.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: CI – Run Tests
2+
3+
on:
4+
push:
5+
branches: ["main", "master"]
6+
pull_request:
7+
branches: ["main", "master"]
8+
9+
jobs:
10+
test:
11+
name: pytest
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v4
16+
17+
- uses: actions/setup-python@v5
18+
with:
19+
python-version: "3.11"
20+
cache: "pip"
21+
22+
- name: Install dependencies
23+
run: |
24+
pip install --upgrade pip
25+
pip install -r backend/requirements.txt
26+
pip install pytest pytest-cov
27+
pip install flask-wtf bleach Pillow beautifulsoup4 "pydantic[email]" pytest pytest-cov
28+
29+
- name: Run pytest
30+
env:
31+
GOOGLE_BOOKS_API_KEY: "ci-fake-key"
32+
OPENAI_API_KEY: "ci-fake-key"
33+
GROQ_API_KEY: "ci-fake-key"
34+
GEMINI_API_KEY: "ci-fake-key"
35+
FLASK_ENV: testing
36+
PYTHONPATH: ".:backend"
37+
run: |
38+
python -m pytest tests/ \
39+
--ignore=tests/test_llm.py \
40+
--ignore=tests/test_mood_improvements.py \
41+
--ignore=tests/test_mood_cache_db.py \
42+
--ignore=tests/test_category_cache.py \
43+
--ignore=tests/test_env_validation.py \
44+
--ignore=tests/test_purchase_links.py \
45+
-v --tb=short --cov=backend
46+
47+
- name: Install dependencies
48+
run: |
49+
pip install --upgrade pip
50+
pip install torch --index-url https://download.pytorch.org/whl/cpu
51+
pip install -r backend/requirements.txt
52+
pip install flask-wtf bleach Pillow pytest pytest-cov
53+
54+
- name: Install dependencies
55+
run: |
56+
pip install --upgrade pip
57+
pip install torch --index-url https://download.pytorch.org/whl/cpu
58+
pip install -r backend/requirements.txt
59+
pip install flask-wtf bleach Pillow beautifulsoup4 pytest pytest-cov

‎backend/config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def from_env(cls) -> 'GoogleOAuthConfig':
167167
frontend_redirect_url=os.getenv('FRONTEND_URL', 'http://127.0.0.1:5500/frontend/pages/library.html'),
168168
scope=os.getenv('GOOGLE_OAUTH_SCOPE', 'openid email profile')
169169
)
170-
170+
171171
@dataclass
172172
class EmailConfig:
173173
"""Email service configuration (e.g., SendGrid, Mailgun)."""
41.1 KB
Loading

0 commit comments

Comments
 (0)