From 328880609b0ed6c9cdb6ed87d0dac0972c9bd217 Mon Sep 17 00:00:00 2001 From: Hao Liu Date: Fri, 7 Apr 2023 11:48:34 -0400 Subject: [PATCH] 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 --- Makefile | 3 --- requirements/requirements.txt | 6 ++++-- 2 files changed, 4 insertions(+), 5 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 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index f45e0acb87..217356b5ca 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -172,8 +172,10 @@ idna==3.4 # requests # twisted # yarl -importlib-metadata==5.1.0 - # via markdown +importlib-metadata==4.6.4 + # via + # ansible-runner + # markdown incremental==22.10.0 # via twisted inflect==6.0.2