Skip to content

Commit

Permalink
Simplify targets; add Dependabot GHA config; address other review com…
Browse files Browse the repository at this point in the history
…ments
  • Loading branch information
eloquence committed Jan 24, 2024
1 parent 4129f0f commit d47d933
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 22 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
9 changes: 2 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,13 @@ on: [push, pull_request]
jobs:
checks:
runs-on: ubuntu-latest
# We use a standard Debian image to mirror a typical developer environment.
# This should be updated whenever a new Debian stable version is available.
container: debian:bullseye
steps:
- uses: actions/checkout@v4
- name: Install dependencies
run: |
apt-get update && apt-get install --yes --no-install-recommends make python3-pip
pip install -r test-requirements.txt
- name: Run lint check
- name: Run lint checks
run: |
make check-lint
- name: Run format check
run: |
make check-format
make lint
16 changes: 5 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
DEFAULT_GOAL: help
SHELL := /bin/bash

.PHONY: check-lint
check-lint:
.PHONY: lint
lint:
@ruff check .

.PHONY: fix-lint
fix-lint:
@ruff check . --fix

.PHONY: check-format
check-format:
@ruff format --check .

.PHONY: fix-format
fix-format:
.PHONY: fix
fix:
@ruff check . --fix
@ruff format .

.PHONY: securedrop-proxy
Expand Down
2 changes: 0 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ ignore = [
"SIM108",
# Flags any subprocess use
"S603",
# Ruff formatter makes a best effort, but may result in some lines exceeding 100 characters
"E501",
]

[tool.ruff.lint.per-file-ignores]
Expand Down
4 changes: 2 additions & 2 deletions tests/test_reproducible_wheels.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ def test_wheel_builds_match_version_control(name):
]
)
build_cmd = (
f"./scripts/build-sync-wheels --pkg-dir /tmp/monorepo-{name}/{name} --project securedrop-{name}"
" --clobber".split()
f"./scripts/build-sync-wheels --pkg-dir /tmp/monorepo-{name}/{name} "
"--project securedrop-{name} --clobber".split()
)
subprocess.check_call(build_cmd)
# Check for modified files (won't catch new, untracked files)
Expand Down

0 comments on commit d47d933

Please sign in to comment.