From f269d5b2ed1064bf41aed209a58a6c6a57b82801 Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Mon, 10 Aug 2020 09:25:43 -0400 Subject: [PATCH 1/2] Upgrade gitpython to pick up bug fix --- requirements/README.md | 2 ++ requirements/requirements.in | 2 +- requirements/requirements.txt | 2 +- requirements/requirements_ansible.txt | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/requirements/README.md b/requirements/README.md index af672ae20e..412ac93d8d 100644 --- a/requirements/README.md +++ b/requirements/README.md @@ -8,6 +8,8 @@ Commands should be run from inside the `./requirements` directory of the awx rep Make sure you have `patch, awk, python3, python2, python3-venv, python2-virtualenv, pip2, pip3` installed. The development container image should have all these. +Even in the dev container, you may still have to dnf install `libpq-devel libcurl-devel`. + ### Upgrading or Adding Select Libraries If you need to add or upgrade one targeted library, then modify `requirements.in`, diff --git a/requirements/requirements.in b/requirements/requirements.in index b03e163e3c..cc194454a7 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -23,7 +23,7 @@ django-split-settings django-taggit djangorestframework djangorestframework-yaml -GitPython +GitPython>=3.1.1 # minimum to fix https://github.com/ansible/awx/issues/6119 irc jinja2 jsonschema diff --git a/requirements/requirements.txt b/requirements/requirements.txt index a493b4c863..8820e46b29 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -43,7 +43,7 @@ djangorestframework==3.11.0 # via -r /awx_devel/requirements/requirements.in docutils==0.16 # via python-daemon future==0.16.0 # via django-radius gitdb==4.0.2 # via gitpython -gitpython==3.1.0 # via -r /awx_devel/requirements/requirements.in +gitpython==3.1.7 # via -r /awx_devel/requirements/requirements.in google-auth==1.11.3 # via kubernetes hiredis==1.0.1 # via aioredis hyperlink==19.0.0 # via twisted diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt index 55db209e4e..8c22484b19 100644 --- a/requirements/requirements_ansible.txt +++ b/requirements/requirements_ansible.txt @@ -26,7 +26,7 @@ azure-mgmt-loganalytics==0.2.0 # via -r /awx_devel/requirements/requirements_an azure-mgmt-marketplaceordering==0.1.0 # via -r /awx_devel/requirements/requirements_ansible.in azure-mgmt-monitor==0.5.2 # via -r /awx_devel/requirements/requirements_ansible.in azure-mgmt-network==2.3.0 # via -r /awx_devel/requirements/requirements_ansible.in -azure-mgmt-nspkg==2.0.0 # via -r /awx_devel/requirements/requirements_ansible.in, azure-mgmt-authorization, azure-mgmt-automation, azure-mgmt-batch, azure-mgmt-cdn, azure-mgmt-compute, azure-mgmt-containerinstance, azure-mgmt-containerregistry, azure-mgmt-containerservice, azure-mgmt-cosmosdb, azure-mgmt-devtestlabs, azure-mgmt-dns, azure-mgmt-hdinsight, azure-mgmt-iothub, azure-mgmt-keyvault, azure-mgmt-loganalytics, azure-mgmt-marketplaceordering, azure-mgmt-monitor, azure-mgmt-network, azure-mgmt-rdbms, azure-mgmt-redis, azure-mgmt-resource, azure-mgmt-servicebus, azure-mgmt-sql, azure-mgmt-storage, azure-mgmt-trafficmanager, azure-mgmt-web +azure-mgmt-nspkg==2.0.0; python_version < "3" # via -r /awx_devel/requirements/requirements_ansible.in, azure-mgmt-authorization, azure-mgmt-automation, azure-mgmt-batch, azure-mgmt-cdn, azure-mgmt-compute, azure-mgmt-containerinstance, azure-mgmt-containerregistry, azure-mgmt-containerservice, azure-mgmt-cosmosdb, azure-mgmt-devtestlabs, azure-mgmt-dns, azure-mgmt-hdinsight, azure-mgmt-iothub, azure-mgmt-keyvault, azure-mgmt-loganalytics, azure-mgmt-marketplaceordering, azure-mgmt-monitor, azure-mgmt-network, azure-mgmt-rdbms, azure-mgmt-redis, azure-mgmt-resource, azure-mgmt-servicebus, azure-mgmt-sql, azure-mgmt-storage, azure-mgmt-trafficmanager, azure-mgmt-web azure-mgmt-rdbms==1.4.1 # via -r /awx_devel/requirements/requirements_ansible.in azure-mgmt-redis==5.0.0 # via -r /awx_devel/requirements/requirements_ansible.in azure-mgmt-resource==2.1.0 # via -r /awx_devel/requirements/requirements_ansible.in @@ -96,7 +96,7 @@ pynacl==1.3.0 # via paramiko pyopenssl==19.1.0 # via azure-cli-core, requests-credssp pyparsing==2.4.5 # via packaging python-dateutil==2.8.1 # via adal, azure-storage, botocore, kubernetes -python-string-utils==0.6.0; python_version < "3" # via openshift +python-string-utils==0.6.0 # via openshift pyvmomi==6.7.3 # via -r /awx_devel/requirements/requirements_ansible.in pywinrm[kerberos]==0.3.0 # via -r /awx_devel/requirements/requirements_ansible.in pyyaml==5.2 # via azure-cli-core, knack, kubernetes, openstacksdk From 8aacd006e06e91e503e3a4d0cf2a843fdf9d9bbd Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Mon, 10 Aug 2020 09:54:07 -0400 Subject: [PATCH 2/2] Revert updater changes to Ansible requirements --- requirements/requirements_ansible.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt index 8c22484b19..55db209e4e 100644 --- a/requirements/requirements_ansible.txt +++ b/requirements/requirements_ansible.txt @@ -26,7 +26,7 @@ azure-mgmt-loganalytics==0.2.0 # via -r /awx_devel/requirements/requirements_an azure-mgmt-marketplaceordering==0.1.0 # via -r /awx_devel/requirements/requirements_ansible.in azure-mgmt-monitor==0.5.2 # via -r /awx_devel/requirements/requirements_ansible.in azure-mgmt-network==2.3.0 # via -r /awx_devel/requirements/requirements_ansible.in -azure-mgmt-nspkg==2.0.0; python_version < "3" # via -r /awx_devel/requirements/requirements_ansible.in, azure-mgmt-authorization, azure-mgmt-automation, azure-mgmt-batch, azure-mgmt-cdn, azure-mgmt-compute, azure-mgmt-containerinstance, azure-mgmt-containerregistry, azure-mgmt-containerservice, azure-mgmt-cosmosdb, azure-mgmt-devtestlabs, azure-mgmt-dns, azure-mgmt-hdinsight, azure-mgmt-iothub, azure-mgmt-keyvault, azure-mgmt-loganalytics, azure-mgmt-marketplaceordering, azure-mgmt-monitor, azure-mgmt-network, azure-mgmt-rdbms, azure-mgmt-redis, azure-mgmt-resource, azure-mgmt-servicebus, azure-mgmt-sql, azure-mgmt-storage, azure-mgmt-trafficmanager, azure-mgmt-web +azure-mgmt-nspkg==2.0.0 # via -r /awx_devel/requirements/requirements_ansible.in, azure-mgmt-authorization, azure-mgmt-automation, azure-mgmt-batch, azure-mgmt-cdn, azure-mgmt-compute, azure-mgmt-containerinstance, azure-mgmt-containerregistry, azure-mgmt-containerservice, azure-mgmt-cosmosdb, azure-mgmt-devtestlabs, azure-mgmt-dns, azure-mgmt-hdinsight, azure-mgmt-iothub, azure-mgmt-keyvault, azure-mgmt-loganalytics, azure-mgmt-marketplaceordering, azure-mgmt-monitor, azure-mgmt-network, azure-mgmt-rdbms, azure-mgmt-redis, azure-mgmt-resource, azure-mgmt-servicebus, azure-mgmt-sql, azure-mgmt-storage, azure-mgmt-trafficmanager, azure-mgmt-web azure-mgmt-rdbms==1.4.1 # via -r /awx_devel/requirements/requirements_ansible.in azure-mgmt-redis==5.0.0 # via -r /awx_devel/requirements/requirements_ansible.in azure-mgmt-resource==2.1.0 # via -r /awx_devel/requirements/requirements_ansible.in @@ -96,7 +96,7 @@ pynacl==1.3.0 # via paramiko pyopenssl==19.1.0 # via azure-cli-core, requests-credssp pyparsing==2.4.5 # via packaging python-dateutil==2.8.1 # via adal, azure-storage, botocore, kubernetes -python-string-utils==0.6.0 # via openshift +python-string-utils==0.6.0; python_version < "3" # via openshift pyvmomi==6.7.3 # via -r /awx_devel/requirements/requirements_ansible.in pywinrm[kerberos]==0.3.0 # via -r /awx_devel/requirements/requirements_ansible.in pyyaml==5.2 # via azure-cli-core, knack, kubernetes, openstacksdk