Skip to content

Commit

Permalink
Merge branch 'brew' into gh-workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
lengau committed Sep 19, 2024
2 parents ad13a69 + 4efe733 commit 249ff49
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,18 @@ $(DEVENVPIP):
$(SYSDEPS_INSTALLED): sysdeps.mk
ifeq ($(shell command -v apt-get > /dev/null; echo $$?),0)
sudo apt-get install --yes $(APT_SYSDEPS)
else ifeq ($(shell command -v brew > /dev/null; echo $$?),0)
brew install $(BREW_SYSDEPS)
else
@echo 'System dependencies can only be installed automatically on'
@echo 'systems with "apt-get". On OSX you can manually use Homebrew'
@echo 'if there are missing dependencies corresponding to the following'
@echo 'Debian packages:'
@echo 'systems with "apt-get" or "brew". Dependencies correspond to'
@echo 'the following Debian packages:'
@echo '$(APT_SYSDEPS).'
endif
@command -v tox > /dev/null || (echo "Could not find tox on the PATH"; exit 1)
@command -v isort > /dev/null || (echo "Could not find isort on the PATH"; exit 1)
touch $(SYSDEPS_INSTALLED)


.PHONY: check
check: setup lint
@tox
Expand Down
1 change: 1 addition & 0 deletions sysdeps.mk
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
APT_SYSDEPS = python3-pip python3-setuptools libsodium-dev libffi-dev libssl-dev tox isort
BREW_SYSDEPS = python3 libsodium libffi openssl tox isort
4 changes: 3 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# Copyright 2017 Canonical Ltd.
# Copyright 2017,2024 Canonical Ltd.
# Licensed under the LGPLv3, see LICENCE file for details.

[tox]
envlist = lint, py27, py35, docs
# envlist = py27
# If the system has tox < 4.8, installs a newer tox in a venv.
minversion = 4.8

[testenv]
setenv =
Expand Down

0 comments on commit 249ff49

Please sign in to comment.