Skip to content
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
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
10 changes: 9 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,12 @@ allure-results
.github
Jenkinsfile.groovy
Makefile
buildspec.yaml
buildspec.yaml
.venv
.env.default
copilot
.idea
docs

htmlcov
.coverage
4 changes: 1 addition & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
version: 2
updates:
- package-ecosystem: "pip"
- package-ecosystem: "uv"
directory: "/"
schedule:
interval: "weekly"
allow:
- dependency-type: "all"
ignore:
- dependency-name: "pipenv"
commit-message:
prefix: "[pip] Dependabot:"
prefix-development: "[pip-dev] Dependabot:"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/code_quality.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
run: git secrets --register-aws
- name: Scan aws secrets
run: git secrets --scan
- name: Install pipenv
run: python -m pip install --upgrade pip && pip install pipenv
- name: Install deps
run: pipenv sync --system --dev
- name: Install uv
uses: astral-sh/setup-uv@v6
- name: Install dependencies
run: uv sync --locked
- name: Check formatting
run: ruff check . && ruff format --check .
run: uv run ruff check . && uv run ruff format --check .
- name: Check types
run: mypy ./
run: uv run mypy ./
2 changes: 1 addition & 1 deletion .github/workflows/pr-open.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
MSG_MINIMAL: actions url

run-unit-tests:
uses: ChildMindInstitute/mindlogger-backend-refactor/.github/workflows/tests.yaml@develop
uses: ChildMindInstitute/mindlogger-backend-refactor/.github/workflows/tests.yaml
secrets: inherit

comment-unit-tests:
Expand Down
16 changes: 14 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,24 @@ jobs:
- uses: KengoTODA/actions-setup-docker-compose@v1
with:
version: '2.23.3'

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.13' # or your preferred version
- name: Install uv
uses: astral-sh/setup-uv@v6

- name: Install dependencies
run: |
uv sync --locked

- name: "Running tests"
run: |
cp .env.default .env
echo -e "\nRABBITMQ__USE_SSL=False" >> .env
docker compose up -d
make dtest
docker compose up -d rabbitmq postgres redis mailhog
make test

- name: Collect artifacts
uses: actions/upload-artifact@v4
Expand Down
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ __pycache__/
# Unit test / coverage reports
.coverage
.coverage.*
htmlcov

# Hypothesis
.hypothesis/
Expand All @@ -41,13 +42,10 @@ data/
## Logs
*.log



## Docker stuff
docker-compose.local.yaml



## Project configurations
*.env

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Comment thread
sricharan-varanasi marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ REPORT_COVERAGE_COMMAND = coverage html --show-contexts --title "Coverage for ${

EXPORT_COMMAND = python src/export_spec.py

RUFF_COMMAND = ruff
MYPY_COMMAND = mypy
RUFF_COMMAND = uv run ruff
MYPY_COMMAND = uv run mypy

DOCKER_COMPOSE_EXISTS := $(shell command -v docker-compose 2> /dev/null)

Expand Down
76 changes: 0 additions & 76 deletions Pipfile

This file was deleted.

Loading