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
12 changes: 5 additions & 7 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@
"disableIp6tables": true,
"version": "28.5.1"
},
// NOTE: this conflicts with out own pre-push git hook.
// Currently we do not need git-lfs in this project, anyway.
// "ghcr.io/devcontainers/features/git-lfs:1": {
// "autoPull": true,
// "installDirectlyFromGitHubRelease": true,
// "version": "3.7.1"
// },
"ghcr.io/devcontainers/features/git-lfs:1": {
"autoPull": true,
"installDirectlyFromGitHubRelease": true,
"version": "3.7.1"
},
"ghcr.io/devcontainers/features/github-cli:1": {
"installDirectlyFromGitHubRelease": true,
"version": "2.82.1"
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
description: 'A JSON string array of components to build'
required: false
type: string
default: '["api"]'
default: '["sql_to_arc"]'
outputs:
version:
description: 'Calculated version'
Expand Down Expand Up @@ -145,10 +145,6 @@ jobs:
id: component-meta
run: |
case "${{ matrix.component }}" in
api)
echo "title=FairAgro Advanced Middleware API" >> $GITHUB_OUTPUT
echo "description=Advanced middleware API for FairAgro platform" >> $GITHUB_OUTPUT
;;
sql_to_arc)
echo "title=FairAgro SQL to ARC Converter" >> $GITHUB_OUTPUT
echo "description=Converts SQL database metadata to ARC format for FairAgro platform" >> $GITHUB_OUTPUT
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
with:
push_to_registry: true
version_bump: ${{ startsWith(github.ref_name, 'feature/') && 'patch' || (github.event.inputs.version_bump || 'patch') }}
components: '["api", "sql_to_arc"]' # Add other components here in the future, e.g., '["api", "worker"]'
components: '["sql_to_arc"]' # Add other components here in the future, e.g., '["worker"]'
secrets: inherit

security-scan-release:
Expand Down
212 changes: 0 additions & 212 deletions .github/workflows/helm-release.yml

This file was deleted.

15 changes: 11 additions & 4 deletions .github/workflows/python-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,22 @@ jobs:
echo "❌ Failing workflow due to HIGH or MEDIUM severity security issues found by bandit."
exit 1

- name: Run unit tests with coverage
- name: Run tests (Unit & Integration)
run: |
uv run pytest middleware/*/tests/unit/ --cov=api --cov=api_client --cov=shared --cov=sql_to_arc --cov-report=xml --cov-report=html --cov-report=term-missing --junitxml=pytest-report.xml
uv run pytest \
middleware/*/tests/unit/ \
middleware/*/tests/integration/ \
--cov=sql_to_arc \
--cov-report=xml \
--cov-report=html \
--cov-report=term-missing \
--junitxml=pytest-report.xml

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
with:
file: ./coverage.xml
flags: unittests
flags: tests
name: codecov-umbrella
fail_ci_if_error: false

Expand All @@ -134,4 +141,4 @@ jobs:
echo "| pylint | ✅ Code quality | Static analysis (min score: 8.0) |" >> $GITHUB_STEP_SUMMARY
echo "| mypy | ✅ Type checking | Static type analysis |" >> $GITHUB_STEP_SUMMARY
echo "| bandit | ✅ Security | Security vulnerability scan |" >> $GITHUB_STEP_SUMMARY
echo "| pytest | ✅ Unit tests | Test execution with coverage |" >> $GITHUB_STEP_SUMMARY
echo "| pytest | ✅ Unit & Integration tests | Test execution with coverage |" >> $GITHUB_STEP_SUMMARY
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true,
"python.testing.autoTestDiscoverOnSaveEnabled": true,
"python.testing.pytestPath": ".venv/bin/pytest",
"python.testing.pytestPath": "${workspaceFolder}/.venv/bin/pytest",
"python.testing.cwd": "${workspaceFolder}",
"python-envs.pythonProjects": [],

Expand All @@ -20,7 +20,7 @@
"source.fixAll.ruff": "explicit"
}
},
"python.defaultInterpreterPath": ".venv/bin/python",
"python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python",

"sops-edit.onlyUseButtons": false,
"sops-edit.tempFilePreExtension": "decrypted",
Expand Down
70 changes: 0 additions & 70 deletions dev_environment/compose-external.yaml

This file was deleted.

Loading