External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-18 11:40:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13825 from TheRealHaoLiu/fix-dependency-conflict

Browse Source 
Fix importlib-metadata dependency conflict
This commit is contained in:
Hao Liu
2023-04-07 13:17:49 -04:00
committed by GitHub
parent 71c307ab8a 328880609b
commit 80ebe13841
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -10,9 +10,6 @@ GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
MANAGEMENT_COMMAND ?= awx-manage MANAGEMENT_COMMAND ?= awx-manage
VERSION := $(shell $(PYTHON) tools/scripts/scm_version.py) 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 # 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) COLLECTION_VERSION ?= $(shell $(PYTHON) tools/scripts/scm_version.py | cut -d . -f 1-3)
# args for the ansible-test sanity command # args for the ansible-test sanity command

6
requirements/requirements.txt
View File

@@ -172,8 +172,10 @@ idna==3.4
# requests # requests
# twisted # twisted
# yarl # yarl
importlib-metadata==5.1.0 importlib-metadata==4.6.4
# via markdown # via
# ansible-runner
# markdown
incremental==22.10.0 incremental==22.10.0
# via twisted # via twisted
inflect==6.0.2 inflect==6.0.2