summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorHao Liu <haoli@redhat.com>2023-04-07 17:48:34 +0200
committerHao Liu <haoli@redhat.com>2023-04-07 17:48:34 +0200
commit328880609b0ed6c9cdb6ed87d0dac0972c9bd217 (patch)
treefceefaf69a8bbbc82fdc4232c581589859ad0173 /Makefile
parentMerge pull request #13809 from ansible/feature_usage-collection-pt2 (diff)
downloadawx-328880609b0ed6c9cdb6ed87d0dac0972c9bd217.tar.xz
awx-328880609b0ed6c9cdb6ed87d0dac0972c9bd217.zip
Fix importlib-metadata dependency conflict
rerun requirements/updator.sh to regenerate requirements.txt fix conflict introduced by https://github.com/ansible/ansible-runner/pull/1224
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 0 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index fffa237d3d..9afc7c7440 100644
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,6 @@ GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
MANAGEMENT_COMMAND ?= awx-manage
VERSION := $(shell $(PYTHON) tools/scripts/scm_version.py)
-# temparary workaround for pip resolver issues
-PIP_OPTIONS="--use-deprecated=legacy-resolver"
-
# ansible-test requires semver compatable version, so we allow overrides to hack it
COLLECTION_VERSION ?= $(shell $(PYTHON) tools/scripts/scm_version.py | cut -d . -f 1-3)
# args for the ansible-test sanity command