ci: standardize Python execution across workflows and improve venv caching robustness
Some checks failed
CLI Tests / test-cli (push) Successful in 14s
Package Tests / Python package - aitbc-agent-sdk (push) Successful in 32s
Package Tests / Python package - aitbc-core (push) Successful in 23s
Package Tests / Python package - aitbc-crypto (push) Successful in 9s
Package Tests / Python package - aitbc-sdk (push) Successful in 13s
Package Tests / JavaScript package - aitbc-sdk-js (push) Successful in 7s
Package Tests / JavaScript package - aitbc-token (push) Successful in 12s
Python Tests / test-python (push) Successful in 18s
Staking Tests / test-staking-service (push) Failing after 9s
Staking Tests / test-staking-integration (push) Has been skipped
Staking Tests / test-staking-contract (push) Has been skipped
Staking Tests / run-staking-test-runner (push) Has been skipped

- Changed all Python/pip commands to use `venv/bin/python -m` pattern instead of direct tool invocation or source activation
  - package-tests.yml: pip, mypy, black, pytest now use `venv/bin/python -m`
  - python-tests.yml: ruff, pip, pytest now use `venv/bin/python -m` or `venv/bin/pytest`
  - staking-tests.yml: pytest now uses `venv/bin/pytest` instead of `python3 -m pytest`
- Added missing dependencies to workflow
This commit is contained in:
aitbc
2026-04-20 10:50:16 +02:00
parent 75d0588e29
commit fc803d80d0
5 changed files with 65 additions and 40 deletions

View File

@@ -41,7 +41,9 @@ jobs:
bash scripts/ci/setup-python-venv.sh \ bash scripts/ci/setup-python-venv.sh \
--repo-dir "$PWD" \ --repo-dir "$PWD" \
--venv-dir "$PWD/venv" --venv-dir "$PWD/venv" \
--requirements-file "$PWD/cli/requirements-cli.txt" \
--extra-packages "PyYAML requests cryptography"
echo "✅ Python environment ready" echo "✅ Python environment ready"
- name: Verify CLI imports - name: Verify CLI imports

View File

@@ -63,28 +63,28 @@ jobs:
--extra-packages "pytest mypy black" --extra-packages "pytest mypy black"
if [[ "${{ matrix.package.name }}" == "aitbc-sdk" ]]; then if [[ "${{ matrix.package.name }}" == "aitbc-sdk" ]]; then
venv/bin/pip install -q -e "$WORKSPACE/repo/packages/py/aitbc-crypto" venv/bin/python -m pip install -q -e "$WORKSPACE/repo/packages/py/aitbc-crypto"
fi fi
# Install dependencies # Install dependencies
if [[ -f "pyproject.toml" ]]; then if [[ -f "pyproject.toml" ]]; then
venv/bin/pip install -q -e ".[dev]" 2>/dev/null || venv/bin/pip install -q -e . venv/bin/python -m pip install -q -e ".[dev]" 2>/dev/null || venv/bin/python -m pip install -q -e .
fi fi
if [[ -f "requirements.txt" ]]; then if [[ -f "requirements.txt" ]]; then
venv/bin/pip install -q -r requirements.txt venv/bin/python -m pip install -q -r requirements.txt
fi fi
# Linting # Linting
echo "=== Linting ===" echo "=== Linting ==="
if [[ -d "src" ]]; then if [[ -d "src" ]]; then
mypy src/ --ignore-missing-imports --no-error-summary 2>/dev/null || echo "⚠️ MyPy warnings" venv/bin/python -m mypy src/ --ignore-missing-imports --no-error-summary 2>/dev/null || echo "⚠️ MyPy warnings"
black --check src/ 2>/dev/null || echo "⚠️ Black warnings" venv/bin/python -m black --check src/ 2>/dev/null || echo "⚠️ Black warnings"
fi fi
# Tests # Tests
echo "=== Tests ===" echo "=== Tests ==="
if [[ -d "tests" ]]; then if [[ -d "tests" ]]; then
pytest tests/ -q --tb=short venv/bin/python -m pytest tests/ -q --tb=short
else else
echo "⚠️ No tests directory found" echo "⚠️ No tests directory found"
fi fi
@@ -117,6 +117,7 @@ jobs:
timeout-minutes: 30 timeout-minutes: 30
strategy: strategy:
max-parallel: 1
matrix: matrix:
package: package:
- name: "aitbc-sdk-js" - name: "aitbc-sdk-js"
@@ -147,7 +148,11 @@ jobs:
node --version node --version
npm --version npm --version
npm install --legacy-peer-deps if [[ -f "package-lock.json" ]]; then
npm ci --legacy-peer-deps --no-audit --no-fund
else
npm install --legacy-peer-deps --no-audit --no-fund
fi
# Build # Build
npm run build npm run build
@@ -157,7 +162,11 @@ jobs:
npm run lint 2>/dev/null && echo "✅ Lint passed" || echo "⚠️ Lint skipped" npm run lint 2>/dev/null && echo "✅ Lint passed" || echo "⚠️ Lint skipped"
# Test # Test
if [[ "${{ matrix.package.name }}" == "aitbc-token" ]]; then
npx hardhat test --no-compile
else
npm test npm test
fi
echo "✅ Tests passed" echo "✅ Tests passed"
echo "✅ ${{ matrix.package.name }} completed" echo "✅ ${{ matrix.package.name }} completed"

View File

@@ -53,10 +53,9 @@ jobs:
- name: Run linting - name: Run linting
run: | run: |
cd /var/lib/aitbc-workspaces/python-tests/repo cd /var/lib/aitbc-workspaces/python-tests/repo
source venv/bin/activate
if command -v ruff >/dev/null 2>&1; then if venv/bin/python -m ruff --version >/dev/null 2>&1; then
ruff check apps/ packages/py/ --select E,F --ignore E501 -q || echo "⚠️ Ruff warnings" venv/bin/python -m ruff check apps/ packages/py/ --select E,F --ignore E501 -q || echo "⚠️ Ruff warnings"
fi fi
echo "✅ Linting completed" echo "✅ Linting completed"
@@ -64,19 +63,18 @@ jobs:
- name: Run tests - name: Run tests
run: | run: |
cd /var/lib/aitbc-workspaces/python-tests/repo cd /var/lib/aitbc-workspaces/python-tests/repo
source venv/bin/activate
# Install packages in development mode # Install packages in development mode
pip install -e packages/py/aitbc-crypto/ venv/bin/python -m pip install -e packages/py/aitbc-crypto/
pip install -e packages/py/aitbc-sdk/ venv/bin/python -m pip install -e packages/py/aitbc-sdk/
export PYTHONPATH="apps/coordinator-api/src:apps/blockchain-node/src:apps/wallet/src:packages/py/aitbc-crypto/src:packages/py/aitbc-sdk/src:." export PYTHONPATH="apps/coordinator-api/src:apps/blockchain-node/src:apps/wallet/src:packages/py/aitbc-crypto/src:packages/py/aitbc-sdk/src:."
# Test if packages are importable # Test if packages are importable
python3 -c "import aitbc_crypto; print('✅ aitbc_crypto imported')" venv/bin/python -c "import aitbc_crypto; print('✅ aitbc_crypto imported')"
python3 -c "import aitbc_sdk; print('✅ aitbc_sdk imported')" venv/bin/python -c "import aitbc_sdk; print('✅ aitbc_sdk imported')"
pytest tests/archived_phase_tests/ \ venv/bin/python -m pytest tests/archived_phase_tests/ \
tests/cross_phase/ \ tests/cross_phase/ \
apps/wallet/tests/ \ apps/wallet/tests/ \
packages/py/aitbc-crypto/tests/ \ packages/py/aitbc-crypto/tests/ \

View File

@@ -43,26 +43,24 @@ jobs:
--repo-dir "$PWD" \ --repo-dir "$PWD" \
--venv-dir "$PWD/venv" \ --venv-dir "$PWD/venv" \
--skip-requirements \ --skip-requirements \
--extra-packages "pytest pytest-asyncio" --extra-packages "pytest pytest-asyncio sqlmodel"
echo "✅ Python environment ready" echo "✅ Python environment ready"
- name: Run staking service tests - name: Run staking service tests
run: | run: |
cd /var/lib/aitbc-workspaces/staking-tests/repo cd /var/lib/aitbc-workspaces/staking-tests/repo
source venv/bin/activate
export PYTHONPATH="apps/coordinator-api/src:." export PYTHONPATH="apps/coordinator-api/src:."
echo "🧪 Running staking service tests..." echo "🧪 Running staking service tests..."
python3 -m pytest tests/services/test_staking_service.py -v --tb=short venv/bin/pytest tests/services/test_staking_service.py -v --tb=short
echo "✅ Service tests completed" echo "✅ Service tests completed"
- name: Generate test data - name: Generate test data
run: | run: |
cd /var/lib/aitbc-workspaces/staking-tests/repo cd /var/lib/aitbc-workspaces/staking-tests/repo
source venv/bin/activate
echo "🔧 Generating test data..." echo "🔧 Generating test data..."
python3 scripts/testing/generate_staking_test_data.py venv/bin/python scripts/testing/generate_staking_test_data.py
echo "✅ Test data generated" echo "✅ Test data generated"
- name: Cleanup - name: Cleanup
@@ -86,20 +84,22 @@ jobs:
- name: Setup Python environment - name: Setup Python environment
run: | run: |
cd /var/lib/aitbc-workspaces/staking-integration/repo cd /var/lib/aitbc-workspaces/staking-integration/repo
rm -rf venv
bash scripts/ci/setup-python-venv.sh \ bash scripts/ci/setup-python-venv.sh \
--repo-dir "$PWD" \ --repo-dir "$PWD" \
--venv-dir "$PWD/venv" --venv-dir "$PWD/venv" \
--skip-requirements \
--extra-packages "pytest pytest-asyncio sqlmodel"
echo "✅ Python environment ready" echo "✅ Python environment ready"
- name: Run staking integration tests - name: Run staking integration tests
run: | run: |
cd /var/lib/aitbc-workspaces/staking-integration/repo cd /var/lib/aitbc-workspaces/staking-integration/repo
source venv/bin/activate
export PYTHONPATH="apps/coordinator-api/src:." export PYTHONPATH="apps/coordinator-api/src:."
echo "🧪 Running staking integration tests..." echo "🧪 Running staking integration tests..."
python3 -m pytest tests/integration/test_staking_lifecycle.py -v --tb=short venv/bin/pytest tests/integration/test_staking_lifecycle.py -v --tb=short
echo "✅ Integration tests completed" echo "✅ Integration tests completed"
- name: Cleanup - name: Cleanup
@@ -157,6 +157,7 @@ jobs:
- name: Setup Python environment - name: Setup Python environment
run: | run: |
cd /var/lib/aitbc-workspaces/staking-runner/repo cd /var/lib/aitbc-workspaces/staking-runner/repo
rm -rf venv
bash scripts/ci/setup-python-venv.sh \ bash scripts/ci/setup-python-venv.sh \
--repo-dir "$PWD" \ --repo-dir "$PWD" \

View File

@@ -92,27 +92,37 @@ CACHE_KEY="py${PYTHON_VERSION}-req${REQUIREMENTS_HASH}-extra${EXTRA_HASH}"
CACHE_VENV_DIR="$CACHE_ROOT/$CACHE_KEY" CACHE_VENV_DIR="$CACHE_ROOT/$CACHE_KEY"
LOCK_FILE="$CACHE_ROOT/$CACHE_KEY.lock" LOCK_FILE="$CACHE_ROOT/$CACHE_KEY.lock"
cached_environment_is_valid() {
[[ -x "$CACHE_VENV_DIR/bin/python" ]] || return 1
[[ -x "$CACHE_VENV_DIR/bin/pip" ]] || return 1
"$CACHE_VENV_DIR/bin/python" -c 'import sys; print(sys.executable)' >/dev/null 2>&1 || return 1
"$CACHE_VENV_DIR/bin/pip" --version >/dev/null 2>&1 || return 1
}
build_cached_environment() { build_cached_environment() {
local temp_dir rm -rf "$CACHE_VENV_DIR"
temp_dir="${CACHE_VENV_DIR}.tmp.$$" "$PYTHON_BIN" -m venv "$CACHE_VENV_DIR"
rm -rf "$temp_dir" if ! "$CACHE_VENV_DIR/bin/python" -m pip install -q --upgrade pip setuptools wheel --no-cache-dir; then
"$PYTHON_BIN" -m venv "$temp_dir" rm -rf "$CACHE_VENV_DIR"
source "$temp_dir/bin/activate" return 1
fi
python -m pip install -q --upgrade pip setuptools wheel --no-cache-dir
if [[ -n "$REQUIREMENTS_FILE" && -f "$REQUIREMENTS_FILE" ]]; then if [[ -n "$REQUIREMENTS_FILE" && -f "$REQUIREMENTS_FILE" ]]; then
python -m pip install -q -r "$REQUIREMENTS_FILE" --no-cache-dir if ! "$CACHE_VENV_DIR/bin/python" -m pip install -q -r "$REQUIREMENTS_FILE" --no-cache-dir; then
rm -rf "$CACHE_VENV_DIR"
return 1
fi
fi fi
if [[ -n "$EXTRA_PACKAGES" ]]; then if [[ -n "$EXTRA_PACKAGES" ]]; then
read -r -a extra_array <<< "$EXTRA_PACKAGES" read -r -a extra_array <<< "$EXTRA_PACKAGES"
python -m pip install -q "${extra_array[@]}" --no-cache-dir if ! "$CACHE_VENV_DIR/bin/python" -m pip install -q "${extra_array[@]}" --no-cache-dir; then
rm -rf "$CACHE_VENV_DIR"
return 1
fi
fi fi
deactivate || true
mv "$temp_dir" "$CACHE_VENV_DIR"
} }
if command -v flock >/dev/null 2>&1; then if command -v flock >/dev/null 2>&1; then
@@ -120,10 +130,15 @@ if command -v flock >/dev/null 2>&1; then
flock 9 flock 9
fi fi
if [[ -x "$CACHE_VENV_DIR/bin/python" ]]; then if cached_environment_is_valid; then
echo "✅ Reusing cached Python environment: $CACHE_KEY" echo "✅ Reusing cached Python environment: $CACHE_KEY"
else
if [[ -e "$CACHE_VENV_DIR" ]]; then
echo "⚠️ Invalid cached Python environment detected, rebuilding: $CACHE_KEY"
rm -rf "$CACHE_VENV_DIR"
else else
echo "📦 Building cached Python environment: $CACHE_KEY" echo "📦 Building cached Python environment: $CACHE_KEY"
fi
build_cached_environment build_cached_environment
fi fi