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
4 changes: 2 additions & 2 deletions .github/workflows/lintandformat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/setup-python@v6
id: setup-python
with:
python-version: "3.14"
python-version-file: .python-version

- name: Cache uv folder
id: cache-uv
Expand All @@ -29,7 +29,7 @@ jobs:
key: ${{ runner.os }}-python-${{ steps.setup-python.outputs.python-version }}-uv-${{ hashFiles('requirements.txt', 'requirements-dev.txt') }}

- name: Install uv
run: curl -LsSf https://astral.sh/uv/install.sh | sh
run: curl -LsSf https://astral.sh/uv/0.9.27/install.sh | sh

- name: Install dependencies
run: uv pip install --system -r requirements-dev.txt
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
# Label used to access the service container
redis:
# Docker Hub image
image: redis
image: redis:7.0-alpine3.17
# Set health checks to wait until redis has started
options: >-
--health-cmd "redis-cli ping"
Expand All @@ -32,7 +32,7 @@ jobs:
- 6379:6379
postgres:
# Docker Hub image
image: "postgres:15.1"
image: postgres:15.1-alpine3.17
# Provide the password for postgres
env:
POSTGRES_PASSWORD: "somerealpassword"
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
uses: actions/setup-python@v6
id: setup-python
with:
python-version: "3.14"
python-version-file: .python-version

- name: Cache uv folder
id: cache-uv
Expand All @@ -70,7 +70,7 @@ jobs:
key: ${{ runner.os }}-python-${{ steps.setup-python.outputs.python-version }}-uv-${{ hashFiles('requirements.txt', 'requirements-dev.txt') }}

- name: Install uv
run: curl -LsSf https://astral.sh/uv/install.sh | sh
run: curl -LsSf https://astral.sh/uv/0.9.27/install.sh | sh

- name: Install dependencies
run: uv pip install --system -r requirements-dev.txt
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ __pycache__/
.pytest_cache/
.ruff_cache/

# Databases (PostgreSQL and SQLite)
# Databases (PostgreSQL and SQLite) and Redis volumes
hyperion-redis/
hyperion-db/
*.db

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/astral-sh/uv:python3.14-trixie-slim
FROM ghcr.io/astral-sh/uv:0.9.27-python3.14-trixie-slim

# Default number of workers; can be overridden at runtime
ENV WORKERS=1
Expand Down
8 changes: 5 additions & 3 deletions docker-compose-dev.yaml → compose.dev.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
hyperion-db:
image: postgres
image: postgres:15.1-alpine3.17
container_name: hyperion-db-dev
restart: unless-stopped
environment:
Expand All @@ -12,14 +12,16 @@ services:
ports:
- 5432:5432
volumes:
- hyperion_db_data:/var/lib/postgresql/data
- ./hyperion-db:/var/lib/postgresql/data

hyperion-redis:
image: redis
image: redis:7.0-alpine3.17
container_name: hyperion-redis-dev
restart: unless-stopped
ports:
- 6379:6379
volumes:
- ./hyperion-redis:/data

volumes:
hyperion_db_data:
16 changes: 9 additions & 7 deletions docker-compose.yaml → compose.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
hyperion-db:
image: postgres
image: postgres:15.1-alpine3.17
container_name: hyperion-db
restart: unless-stopped
healthcheck:
Expand All @@ -14,15 +14,17 @@ services:
POSTGRES_DB: ${POSTGRES_DB}
PGTZ: ${POSTGRES_TZ}
volumes:
- ./hyperion_db_data:/var/lib/postgresql/data:Z
- ./hyperion-db:/var/lib/postgresql/data

hyperion-redis:
image: redis
image: redis:7.0-alpine3.17
container_name: hyperion-redis
restart: unless-stopped
command: redis-server --requirepass ${REDIS_PASSWORD}
environment:
REDIS_PASSWORD: ${REDIS_PASSWORD}
volumes:
- ./hyperion-redis:/data

hyperion-app:
build:
Expand All @@ -39,7 +41,7 @@ services:
- 8000:8000
env_file: .env
volumes:
- ./logs:/hyperion/logs:Z
- ./data:/hyperion/data:Z
- ./config.yaml:/hyperion/config.yaml:Z
- ./firebase.json:/hyperion/firebase.json:Z
- ./logs:/hyperion/logs
- ./data:/hyperion/data
- ./config.yaml:/hyperion/config.yaml
- ./firebase.json:/hyperion/firebase.json