Skip to content

Commit

Permalink
Sync boilerplate.
Browse files Browse the repository at this point in the history
* install.sh: drop quotes around apt packages.
* Makefile: fail make tag if dev tools not installed.
* tox.ini: update ruff invocation to avoid deprecation warning.
* install.sh: drop symlink warning for /boot/config.txt.
  • Loading branch information
Gadgetoid committed May 16, 2024
1 parent 9bddfec commit 525805b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ endif
@echo "deploy: build and upload to PyPi"
@echo "tag: tag the repository with the current version\n"

version:
@hatch version

install:
./install.sh --unstable

Expand All @@ -47,7 +50,7 @@ pytest:
nopost:
@bash check.sh --nopost

tag:
tag: version
git tag -a "v${LIBRARY_VERSION}" -m "Version ${LIBRARY_VERSION}"

build: check
Expand Down
8 changes: 2 additions & 6 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,6 @@ find_config() {
if [ ! -f "$CONFIG_DIR/$CONFIG_FILE" ]; then
fatal "Could not find $CONFIG_FILE!"
fi
else
if [ -f "/boot/$CONFIG_FILE" ] && [ ! -L "/boot/$CONFIG_FILE" ]; then
warning "Oops! It looks like /boot/$CONFIG_FILE is not a link to $CONFIG_DIR/$CONFIG_FILE"
warning "You might want to fix this!"
fi
fi
inform "Using $CONFIG_FILE in $CONFIG_DIR"
}
Expand Down Expand Up @@ -156,7 +151,8 @@ function apt_pkg_install {
sudo apt update
APT_HAS_UPDATED=true
fi
sudo apt install -y "$PACKAGES"
# shellcheck disable=SC2086
sudo apt install -y $PACKAGES
check_for_error
if [ -f "$UNINSTALLER" ]; then
echo "apt uninstall -y $PACKAGES" >> "$UNINSTALLER"
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ commands =
python -m build --no-isolation
python -m twine check dist/*
isort --check .
ruff .
ruff check .
codespell .
deps =
check-manifest
Expand Down

0 comments on commit 525805b

Please sign in to comment.