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
2 changes: 1 addition & 1 deletion .github/workflows/dependency-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ jobs:
echo "Images Successfully Pulled: $PULL_SUCCESS/$PULL_TOTAL" >> $GITHUB_STEP_SUMMARY
echo "" >> $GITHUB_STEP_SUMMARY
echo "Available Container Images:" >> $GITHUB_STEP_SUMMARY
podman images --format "table {{.Repository}}:{{.Tag}} {{.Size}} {{.Created}}" >> $GITHUB_STEP_SUMMARY
podman images --format "table {{.Repository}}:{{.Tag}} {{.Size}} {{.Created}}" >> $GITHUB_STEP_SUMMARY || echo "Unable to list container images (podman error)" >> $GITHUB_STEP_SUMMARY
echo '```' >> $GITHUB_STEP_SUMMARY

dependency-security-scan:
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ testinfra

# Security tools for CI/CD
bandit>=1.7.0
safety>=2.0.0
safety>=3.7.0

# Container testing (Podman specific)
molecule-podman
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ passlib>=1.7.4

# Security tools
bandit>=1.7.0
safety>=2.0.0
safety>=3.7.0

# Development and testing tools
pre-commit>=2.15.0
Expand Down
13 changes: 8 additions & 5 deletions scripts/validate-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,17 @@ main() {

check_python_dependencies() {
log_info "Checking Python dependencies..."

# Check if Python 3.11 is available
if command -v python3.11 &> /dev/null; then

# Check for Python versions (3.12, 3.11, 3.9)
if command -v python3.12 &> /dev/null; then
PYTHON_VERSION=$(python3.12 --version)
log_success "Python 3.12 found: $PYTHON_VERSION"
elif command -v python3.11 &> /dev/null; then
PYTHON_VERSION=$(python3.11 --version)
log_success "Python 3.11 found: $PYTHON_VERSION"
elif command -v python3.9 &> /dev/null; then
PYTHON_VERSION=$(python3.9 --version)
log_warning "Python 3.9 found (recommend 3.11): $PYTHON_VERSION"
log_warning "Python 3.9 found (recommend 3.11+): $PYTHON_VERSION"
else
log_error "No compatible Python version found"
return 1
Expand Down Expand Up @@ -165,7 +168,7 @@ generate_dependency_report() {
"validation_results": {
"python": {
"version": "${PYTHON_VERSION:-unknown}",
"status": "$(command -v python3.11 &> /dev/null && echo "ok" || echo "warning")"
"status": "$({ command -v python3.12 || command -v python3.11; } &> /dev/null && echo "ok" || echo "warning")"
},
"ansible": {
"installed": $(command -v ansible &> /dev/null && echo "true" || echo "false"),
Expand Down
Loading