Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/pr-validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
REFRESH_SECRET_KEY: ${{ secrets.REFRESH_SECRET_KEY }}
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3.10
uses: actions/setup-python@v3
with:
python-version: "3.8"
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: '20.x'
node-version: '20.19'

- name: Test with Jest
run: |
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.10.0
v20.19.0
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,13 @@ Navigate to [http://localhost:$RESERVATION_PORT/docs](http://localhost:$RESERVAT
To run the service, you will need to install the following tools.

- [NodeJS](https://nodejs.org/en/)
- [Python 3.10](https://www.python.org/downloads/) (or via [pyenv](https://github.com/pyenv/pyenv))
- [Docker](https://www.docker.com/)

The below are optional but highly recommended:

- [nvm](https://github.com/nvm-sh/nvm) - Used to manage NodeJS versions.
- [pyenv](https://github.com/pyenv/pyenv) - Used to manage Python versions.
- [Direnv](https://direnv.net/) - Used to manage environment variables.

## Getting Started
Expand All @@ -89,9 +91,11 @@ Key backend variables include `SECRET_KEY`, `REFRESH_SECRET_KEY`, `PG_URL`, and
Execute the following in your terminal:

```bash
pyenv install 3.10.20 # if not already installed
pyenv local 3.10.20
python -m venv venv
source venv/bin/activate # for Windows, source venv/Scripts/activate
python -m pip install --upgrade pip
source venv/bin/activate # for Windows, source venv/Scripts/activate
python -m pip install --upgrade pip
pip install -r requirements.txt
```

Expand Down
2 changes: 1 addition & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8.3
FROM python:3.10.20

ARG RESERVATION_PORT=80
ARG ENV
Expand Down
12 changes: 6 additions & 6 deletions backend/requirements-docker.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ariadne==0.22
asyncpg==0.30.0
fastapi==0.115.8
ariadne==0.25.2
asyncpg==0.31.0
fastapi==0.136.3
httpx==0.27.0
pydantic==2.10.6
python-multipart==0.0.20
python-jose==3.3.0
pydantic==2.13.4
python-multipart==0.0.29
python-jose==3.5.0
uvicorn==0.34.0
28 changes: 14 additions & 14 deletions backend/src/requirements_docker.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
ariadne==0.22
asyncpg==0.30.0
ariadne==0.25.2
asyncpg==0.31.0
black==23.10.1
fastapi==0.115.8
fastapi==0.136.3
flake8==6.1.0
httpx==0.27.0
isort==5.13.2
psycopg2-binary==2.9.9
pydantic==2.10.6
pytest==7.4.3
pytest-asyncio==0.23.3
pytest-cov==4.1.0
httpx==0.26.0
isort==8.0.1
psycopg2-binary==2.9.12
pydantic==2.13.4
pytest==9.0.3
pytest-asyncio==1.3.0
pytest-cov==7.1.0
pytest-mock==3.12.0
python-jose==3.3.0
python-multipart==0.0.20
SQLAlchemy==2.0.24
uvicorn==0.34.0
python-jose==3.5.0
python-multipart==0.0.29
SQLAlchemy==2.0.50
uvicorn==0.34.0
9 changes: 6 additions & 3 deletions backend/src/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@
ACCESS_TOKEN_EXPIRE_MINUTES = 60
REFRESH_TOKEN_EXPIRE_MINUTES = 60 * 24 # 1 day

SECRET_KEY = getenv("SECRET_KEY")
REFRESH_SECRET_KEY = getenv("REFRESH_SECRET_KEY")
_test_mode = ENV == "test"
SECRET_KEY = getenv("SECRET_KEY") or ("test-secret-key" if _test_mode else None)
REFRESH_SECRET_KEY = getenv("REFRESH_SECRET_KEY") or (
"test-refresh-secret-key" if _test_mode else None
)

_missing = [
name
Expand All @@ -23,5 +26,5 @@
]
if not val
]
if _missing and ENV != "test":
if _missing and not _test_mode:
raise RuntimeError(f"Missing required environment variables: {', '.join(_missing)}")
2 changes: 1 addition & 1 deletion frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20 as build-stage
FROM node:20.19 as build-stage
WORKDIR /app
COPY . .
RUN npm ci
Expand Down
Loading
Loading