diff options
| author | Ryan Petrello <rpetrell@redhat.com> | 2020-10-22 16:56:26 +0200 |
|---|---|---|
| committer | Ryan Petrello <rpetrell@redhat.com> | 2020-10-30 21:39:57 +0100 |
| commit | 4445d096f575b6985b9bf32a5db7de59ae271b4c (patch) | |
| tree | d19f19a312f3b7ff96921da05a8409cb89c1ee65 /requirements | |
| parent | Enable source vars for all inventory types (diff) | |
| download | awx-4445d096f575b6985b9bf32a5db7de59ae271b4c.tar.xz awx-4445d096f575b6985b9bf32a5db7de59ae271b4c.zip | |
reimplement licensing to work with RHSM and entitlement uploads
Co-authored-by: Christian Adams <chadams@redhat.com>
Diffstat (limited to 'requirements')
| -rw-r--r-- | requirements/requirements.txt | 3 | ||||
| -rw-r--r-- | requirements/requirements_git.txt | 1 | ||||
| -rwxr-xr-x | requirements/updater.sh | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/requirements/requirements.txt b/requirements/requirements.txt index dac5c5267d..8bbc446236 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -52,6 +52,7 @@ idna==2.9 # via hyperlink, idna-ssl, requests, twisted, yarl importlib-metadata==1.5.0 # via importlib-resources, irc, jsonschema importlib-resources==1.4.0 # via jaraco.text incremental==17.5.0 # via twisted +iniparse==0.5 # via rhsm irc==18.0.0 # via -r /awx_devel/requirements/requirements.in isodate==0.6.0 # via msrest, python3-saml jaraco.classes==3.1.0 # via jaraco.collections @@ -108,7 +109,7 @@ ruamel.yaml.clib==0.2.0 # via ruamel.yaml ruamel.yaml==0.16.10 # via openshift schedule==0.6.0 # via -r /awx_devel/requirements/requirements.in service-identity==18.1.0 # via twisted -six==1.14.0 # via ansible-runner, automat, cryptography, django-extensions, django-pglocks, google-auth, isodate, jaraco.collections, jaraco.logging, jaraco.text, jsonschema, kubernetes, openshift, pygerduty, pyopenssl, pyrad, pyrsistent, python-dateutil, slackclient, social-auth-app-django, social-auth-core, tacacs-plus, twilio, txaio, websocket-client +six==1.14.0 # via ansible-runner, automat, cryptography, django-extensions, django-pglocks, google-auth, iniparse, isodate, jaraco.collections, jaraco.logging, jaraco.text, jsonschema, kubernetes, openshift, pygerduty, pyopenssl, pyrad, pyrsistent, python-dateutil, slackclient, social-auth-app-django, social-auth-core, tacacs-plus, twilio, txaio, websocket-client slackclient==1.1.2 # via -r /awx_devel/requirements/requirements.in smmap==3.0.1 # via gitdb social-auth-app-django==3.1.0 # via -r /awx_devel/requirements/requirements.in diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt index 340cbfdcc7..ff7a407ae5 100644 --- a/requirements/requirements_git.txt +++ b/requirements/requirements_git.txt @@ -1 +1,2 @@ git+https://github.com/ansible/system-certifi.git@devel#egg=certifi +git+https://github.com/ansible/python-rhsm.git@python3-backport#egg=rhsm diff --git a/requirements/updater.sh b/requirements/updater.sh index 7915ef286c..3d93b4d815 100755 --- a/requirements/updater.sh +++ b/requirements/updater.sh @@ -4,6 +4,7 @@ set -ue requirements_in="$(readlink -f ./requirements.in)" requirements_ansible_in="$(readlink -f ./requirements_ansible.in)" requirements="$(readlink -f ./requirements.txt)" +requirements_git="$(readlink -f ./requirements_git.txt)" requirements_ansible="$(readlink -f ./requirements_ansible.txt)" pip_compile="pip-compile --no-header --quiet -r --allow-unsafe" @@ -31,7 +32,11 @@ generate_requirements_v3() { install_deps - ${pip_compile} --output-file requirements.txt "${requirements_in}" + ${pip_compile} --output-file requirements.txt "${requirements_in}" "${requirements_git}" + # consider the git requirements for purposes of resolving deps + # Then remove any git+ lines from requirements.txt + cp requirements.txt requirements_tmp.txt + grep -v "^git+" requirements_tmp.txt > requirements.txt && rm requirements_tmp.txt ${pip_compile} --output-file requirements_ansible_py3.txt "${requirements_ansible_in}" } |