Skip to content

Commit

Permalink
Merge pull request #285 from jwhonce/wip/support_macos
Browse files Browse the repository at this point in the history
Refactor Makefile to support tox / MacOS Ventura
  • Loading branch information
openshift-merge-robot authored Jun 20, 2023
2 parents cfd9dc6 + 8fffd34 commit efe4995
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export GO111MODULE=off
export GOPROXY=https://proxy.golang.org


PYTHON ?= $(shell command -v python3 2>/dev/null || command -v python)
PYTHON ?= $(shell command -v python3 2>/dev/null || command -v python || which python3)
DESTDIR ?= /
DESTDIR ?=
EPOCH_TEST_COMMIT ?= $(shell git merge-base $${DEST_BRANCH:-main} HEAD)
Expand Down Expand Up @@ -38,7 +38,11 @@ integration:

.PHONY: tox
tox:
ifeq (, $(shell which dnf))
brew install [email protected] [email protected] [email protected] [email protected]
else
-dnf install -y python3 python3.6 python3.8 python3.9
endif
# ensure tox is available. It will take care of other testing requirements
$(PYTHON) -m pip install --user tox

Expand Down

0 comments on commit efe4995

Please sign in to comment.