From 7df6f8d88c4b36e97c6e2cc209d901cf022ee205 Mon Sep 17 00:00:00 2001 From: Satoe Imaishi Date: Fri, 24 Sep 2021 12:32:25 -0400 Subject: [PATCH 1/3] Add pbr to venv temporarily --- requirements/requirements.in | 4 ++++ requirements/requirements.txt | 2 ++ requirements/requirements_git.txt | 1 + 3 files changed, 7 insertions(+) diff --git a/requirements/requirements.in b/requirements/requirements.in index 70be91deb8..68cb3852df 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -59,3 +59,7 @@ uwsgitop wheel pip==19.3.1 # see UPGRADE BLOCKERs setuptools==41.6.0 # see UPGRADE BLOCKERs + +# Temporarily added to use ansible-runner from git branch, to be removed +# when ansible-runner moves from requirements_git.txt to here +pbr diff --git a/requirements/requirements.txt b/requirements/requirements.txt index dc96cac763..b7e9781d4b 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -224,6 +224,8 @@ oauthlib==3.1.0 # social-auth-core openshift==0.11.0 # via -r /awx_devel/requirements/requirements.in +pbr==5.6.0 + # via -r /awx_devel/requirements/requirements.in pexpect==4.7.0 # via # -r /awx_devel/requirements/requirements.in diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt index 2ccc335035..1d7951d079 100644 --- a/requirements/requirements_git.txt +++ b/requirements/requirements_git.txt @@ -1,3 +1,4 @@ git+https://github.com/ansible/system-certifi.git@devel#egg=certifi +# Remove pbr from requirements.in when moving ansible-runner to requirements.in git+https://github.com/ansible/ansible-runner.git@devel#egg=ansible-runner https://receptor-nightlies.s3.amazonaws.com/receptorctl/receptorctl-latest-py3-none-any.whl From b6179c60730db523314cac1344f5031f4e72a8d5 Mon Sep 17 00:00:00 2001 From: Satoe Imaishi Date: Mon, 27 Sep 2021 22:14:47 -0400 Subject: [PATCH 2/3] receptorctl whl with version number --- requirements/requirements_git.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt index 1d7951d079..13c5dd6bff 100644 --- a/requirements/requirements_git.txt +++ b/requirements/requirements_git.txt @@ -1,4 +1,4 @@ git+https://github.com/ansible/system-certifi.git@devel#egg=certifi # Remove pbr from requirements.in when moving ansible-runner to requirements.in git+https://github.com/ansible/ansible-runner.git@devel#egg=ansible-runner -https://receptor-nightlies.s3.amazonaws.com/receptorctl/receptorctl-latest-py3-none-any.whl +https://receptor-nightlies.s3.amazonaws.com/receptorctl/receptorctl-0.0.0-py3-none-any.whl From f3f781917a3320ddfe247e7ec06887d9a224a5ef Mon Sep 17 00:00:00 2001 From: Satoe Imaishi Date: Tue, 28 Sep 2021 10:56:49 -0400 Subject: [PATCH 3/3] Skip pbr license check if ansible-runner isn't a released version --- awx/main/tests/functional/test_licenses.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/awx/main/tests/functional/test_licenses.py b/awx/main/tests/functional/test_licenses.py index 62a7291115..8ff2e72bfe 100644 --- a/awx/main/tests/functional/test_licenses.py +++ b/awx/main/tests/functional/test_licenses.py @@ -48,6 +48,7 @@ def test_python_and_js_licenses(): def read_api_requirements(path): ret = {} + skip_pbr_license_check = False for req_file in ['requirements.txt', 'requirements_git.txt']: fname = '%s/%s' % (path, req_file) @@ -65,7 +66,11 @@ def test_python_and_js_licenses(): name = name[:-4] if name == 'receptor': name = 'receptorctl' + if name == 'ansible-runner': + skip_pbr_license_check = True ret[name] = {'name': name, 'version': version} + if 'pbr' in ret and skip_pbr_license_check: + del ret['pbr'] return ret def read_ui_requirements(path):