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

Update Azure requirements to match Ansible 2.7 requirements.

Browse Source 
Add comments for Ansible requirements to note where they're used.

Remove our custom docutils fork, as the fix was merged upstream.
This commit is contained in:
Bill Nottingham
2018-10-17 22:52:39 -04:00
parent 98b8d7fb69
commit 8adbc8a026
6 changed files with 68 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements/README.md
View File

@@ -21,5 +21,3 @@ pip-compile requirements/requirements_ansible.in > requirements/requirements_ans
* As of `pip-tools` `1.8.1` `pip-compile` does not resolve packages specified using a git url. Thus, dependencies for things like `dm.xmlsec.binding` do not get resolved and output to `requirements.txt`. This means that: * As of `pip-tools` `1.8.1` `pip-compile` does not resolve packages specified using a git url. Thus, dependencies for things like `dm.xmlsec.binding` do not get resolved and output to `requirements.txt`. This means that:
* can't use `pip install --no-deps` because other deps WILL be sucked in * can't use `pip install --no-deps` because other deps WILL be sucked in
* all dependencies are NOT captured in our `.txt` files. This means you can't rely on the `.txt` when gathering licenses. * all dependencies are NOT captured in our `.txt` files. This means you can't rely on the `.txt` when gathering licenses.
* Package `docutils`, as an upstream of `boto3`, is commented out in both `requirements.txt` and `requirements_ansible.txt` because the official package has a bug that causes RPM build failure. [Here](https://sourceforge.net/p/docutils/bugs/321/) is the bug report. Please do not uncomment it before the bug fix lands. For now we are using [a monkey-patch version of `docutils`](https://github.com/ansible/docutils.git) that comes with the bug fix. It's included in `requirements_git.txt` and `requirements_ansible_git.txt`.

1
requirements/requirements.txt
View File

@@ -40,6 +40,7 @@ django-taggit==0.22.2
django==1.11.16 django==1.11.16
djangorestframework-yaml==1.0.3 djangorestframework-yaml==1.0.3
djangorestframework==3.7.7 djangorestframework==3.7.7
docutils==0.14 # via botocore
enum34==1.1.6 # via cryptography enum34==1.1.6 # via cryptography
functools32==3.2.3.post2 # via jsonschema functools32==3.2.3.post2 # via jsonschema
futures==3.2.0 # via requests-futures futures==3.2.0 # via requests-futures

64
requirements/requirements_ansible.in
View File

@@ -1,36 +1,54 @@
# GCE
apache-libcloud==2.2.1 apache-libcloud==2.2.1
# azure deps from https://github.com/ansible/ansible/blob/fe1153c0afa1ffd648147af97454e900560b3532/packaging/requirements/requirements-azure.txt # Azure
azure-mgmt-compute>=2.0.0,<3 # Taken from Ansible core module requirements # azure deps from https://github.com/ansible/ansible/blob/stable-2.7/packaging/requirements/requirements-azure.txt
azure-mgmt-network>=1.3.0,<2 packaging
azure-mgmt-storage>=1.5.0,<2 azure-cli-core==2.0.35
azure-mgmt-resource>=1.1.0,<2 azure-cli-nspkg==3.0.2
azure-storage>=0.35.1,<0.36 azure-common==1.1.11
azure-cli-core>=2.0.12,<3 azure-mgmt-batch==4.1.0
msrest!=0.4.15 azure-mgmt-compute==2.1.0
msrestazure>=0.4.11,<0.5 azure-mgmt-containerinstance==0.4.0
azure-mgmt-dns>=1.0.1,<2 azure-mgmt-containerregistry==2.0.0
azure-mgmt-keyvault>=0.40.0,<0.41 azure-mgmt-containerservice==3.0.1
azure-mgmt-batch>=4.1.0,<5 azure-mgmt-dns==1.2.0
azure-mgmt-sql>=0.7.1,<0.8 azure-mgmt-keyvault==0.40.0
azure-mgmt-web>=0.32.0,<0.33 azure-mgmt-marketplaceordering==0.1.0
azure-mgmt-containerservice>=2.0.0,<3.0.0 azure-mgmt-monitor==0.5.2
azure-mgmt-containerregistry>=1.0.1 azure-mgmt-network==1.7.1
azure-mgmt-rdbms>=0.2.0rc1,<0.3.0 azure-mgmt-nspkg==2.0.0
azure-mgmt-containerinstance>=0.3.1 azure-mgmt-rdbms==1.2.0
backports.ssl-match-hostname==3.5.0.1 azure-mgmt-resource==1.2.2
azure-mgmt-sql==0.7.1
azure-mgmt-storage==1.5.0
azure-mgmt-trafficmanager==0.50.0
azure-mgmt-web==0.32.0
azure-nspkg==2.0.0
azure-storage==0.35.1
msrest==0.4.29
msrestazure==0.4.31
azure-keyvault==1.0.0a1
azure-graphrbac==0.40.0
# AWS
boto==2.47.0 # last which does not break ec2 scripts boto==2.47.0 # last which does not break ec2 scripts
boto3==1.6.2 boto3==1.6.2
# netaddr filter
netaddr netaddr
# oVirt/RHV
ovirt-engine-sdk-python==4.2.4 # minimum set inside Ansible facts module requirements ovirt-engine-sdk-python==4.2.4 # minimum set inside Ansible facts module requirements
# AWX usage
pexpect==4.6.0 # same as AWX requirement pexpect==4.6.0 # same as AWX requirement
python-memcached==1.59 # same as AWX requirement python-memcached==1.59 # same as AWX requirement
psphere==0.5.2
psutil==5.4.3 # same as AWX requirement psutil==5.4.3 # same as AWX requirement
setuptools==36.0.1
pip==9.0.1
# VMware
psphere==0.5.2
pyvmomi==6.5 pyvmomi==6.5
# WinRM
backports.ssl-match-hostname==3.5.0.1
pywinrm[kerberos]==0.3.0 pywinrm[kerberos]==0.3.0
requests<2.16 # Older versions rely on certify requests<2.16 # Older versions rely on certify
requests-credssp==0.1.0 # For windows authentication awx/issues/1144 requests-credssp==0.1.0 # For windows authentication awx/issues/1144
secretstorage==2.3.1 # OpenStack
shade==1.27.0 shade==1.27.0
setuptools==36.0.1
pip==9.0.1

44
requirements/requirements_ansible.txt
View File

@@ -4,30 +4,35 @@
# #
# pip-compile --output-file requirements/requirements_ansible.txt requirements/requirements_ansible.in # pip-compile --output-file requirements/requirements_ansible.txt requirements/requirements_ansible.in
# #
adal==0.5.0 # via azure-cli-core, msrestazure adal==0.5.0 # via msrestazure
apache-libcloud==2.2.1 apache-libcloud==2.2.1
appdirs==1.4.3 # via openstacksdk, os-client-config appdirs==1.4.3 # via openstacksdk, os-client-config
applicationinsights==0.11.1 # via azure-cli-core applicationinsights==0.11.1 # via azure-cli-core
argcomplete==1.9.4 # via azure-cli-core, knack argcomplete==1.9.4 # via azure-cli-core, knack
asn1crypto==0.24.0 # via cryptography asn1crypto==0.24.0 # via cryptography
azure-cli-core==2.0.28 azure-cli-core==2.0.35
azure-cli-nspkg==3.0.1 # via azure-cli-core azure-cli-nspkg==3.0.2
azure-common==1.1.8 # via azure-mgmt-batch, azure-mgmt-compute, azure-mgmt-containerinstance, azure-mgmt-containerregistry, azure-mgmt-containerservice, azure-mgmt-dns, azure-mgmt-keyvault, azure-mgmt-network, azure-mgmt-rdbms, azure-mgmt-resource, azure-mgmt-sql, azure-mgmt-storage, azure-mgmt-web, azure-storage azure-common==1.1.11
azure-graphrbac==0.40.0
azure-keyvault==1.0.0a1
azure-mgmt-batch==4.1.0 azure-mgmt-batch==4.1.0
azure-mgmt-compute==2.1.0 azure-mgmt-compute==2.1.0
azure-mgmt-containerinstance==0.3.1 azure-mgmt-containerinstance==0.4.0
azure-mgmt-containerregistry==1.0.1 azure-mgmt-containerregistry==2.0.0
azure-mgmt-containerservice==2.0.0 azure-mgmt-containerservice==3.0.1
azure-mgmt-dns==1.2.0 azure-mgmt-dns==1.2.0
azure-mgmt-keyvault==0.40.0 azure-mgmt-keyvault==0.40.0
azure-mgmt-marketplaceordering==0.1.0
azure-mgmt-monitor==0.5.2
azure-mgmt-network==1.7.1 azure-mgmt-network==1.7.1
azure-mgmt-nspkg==2.0.0 # via azure-mgmt-batch, azure-mgmt-compute, azure-mgmt-containerinstance, azure-mgmt-containerregistry, azure-mgmt-containerservice, azure-mgmt-dns, azure-mgmt-keyvault, azure-mgmt-network, azure-mgmt-rdbms, azure-mgmt-resource, azure-mgmt-sql, azure-mgmt-storage, azure-mgmt-web azure-mgmt-nspkg==2.0.0
azure-mgmt-rdbms==0.2.0rc1 azure-mgmt-rdbms==1.2.0
azure-mgmt-resource==1.2.2 azure-mgmt-resource==1.2.2
azure-mgmt-sql==0.7.1 azure-mgmt-sql==0.7.1
azure-mgmt-storage==1.5.0 azure-mgmt-storage==1.5.0
azure-mgmt-trafficmanager==0.50.0
azure-mgmt-web==0.32.0 azure-mgmt-web==0.32.0
azure-nspkg==2.0.0 # via azure-cli-nspkg, azure-common, azure-mgmt-nspkg, azure-storage azure-nspkg==2.0.0
azure-storage==0.35.1 azure-storage==0.35.1
backports.ssl-match-hostname==3.5.0.1 backports.ssl-match-hostname==3.5.0.1
bcrypt==3.1.4 # via paramiko bcrypt==3.1.4 # via paramiko
@@ -37,10 +42,13 @@ botocore==1.9.3 # via boto3, s3transfer
certifi==2018.1.18 # via msrest certifi==2018.1.18 # via msrest
cffi==1.11.5 # via bcrypt, cryptography, pynacl cffi==1.11.5 # via bcrypt, cryptography, pynacl
colorama==0.3.9 # via azure-cli-core, knack colorama==0.3.9 # via azure-cli-core, knack
cryptography==2.1.4 # via adal, azure-storage, paramiko, pyopenssl, requests-kerberos, requests-ntlm, secretstorage configparser==3.5.0 # via entrypoints
cryptography==2.1.4 # via adal, azure-keyvault, azure-storage, paramiko, pyopenssl, requests-kerberos, requests-ntlm, secretstorage
decorator==4.2.1 # via openstacksdk decorator==4.2.1 # via openstacksdk
deprecation==2.0 # via openstacksdk deprecation==2.0 # via openstacksdk
docutils==0.14 # via botocore
dogpile.cache==0.6.5 # via openstacksdk dogpile.cache==0.6.5 # via openstacksdk
entrypoints==0.2.3 # via keyring
enum34==1.1.6 # via cryptography, knack, msrest, ovirt-engine-sdk-python enum34==1.1.6 # via cryptography, knack, msrest, ovirt-engine-sdk-python
futures==3.2.0 # via openstacksdk, s3transfer futures==3.2.0 # via openstacksdk, s3transfer
humanfriendly==4.8 # via azure-cli-core humanfriendly==4.8 # via azure-cli-core
@@ -51,13 +59,13 @@ isodate==0.6.0 # via msrest
jmespath==0.9.3 # via azure-cli-core, boto3, botocore, knack, openstacksdk jmespath==0.9.3 # via azure-cli-core, boto3, botocore, knack, openstacksdk
jsonpatch==1.21 # via openstacksdk jsonpatch==1.21 # via openstacksdk
jsonpointer==2.0 # via jsonpatch jsonpointer==2.0 # via jsonpatch
keyring==11.0.0 # via msrestazure keyring==15.1.0 # via msrestazure
keystoneauth1==3.4.0 # via openstacksdk, os-client-config keystoneauth1==3.4.0 # via openstacksdk, os-client-config
knack==0.3.1 # via azure-cli-core knack==0.3.3 # via azure-cli-core
lxml==4.1.1 # via pyvmomi lxml==4.1.1 # via pyvmomi
monotonic==1.4 # via humanfriendly monotonic==1.4 # via humanfriendly
msrest==0.4.26 msrest==0.4.29
msrestazure==0.4.22 msrestazure==0.4.31
munch==2.2.0 # via openstacksdk munch==2.2.0 # via openstacksdk
netaddr==0.7.19 netaddr==0.7.19
netifaces==0.10.6 # via openstacksdk netifaces==0.10.6 # via openstacksdk
@@ -67,10 +75,10 @@ openstacksdk==0.12.0 # via shade
os-client-config==1.29.0 # via shade os-client-config==1.29.0 # via shade
os-service-types==1.2.0 # via openstacksdk os-service-types==1.2.0 # via openstacksdk
ovirt-engine-sdk-python==4.2.4 ovirt-engine-sdk-python==4.2.4
packaging==17.1 # via deprecation packaging==17.1
paramiko==2.4.0 # via azure-cli-core paramiko==2.4.0 # via azure-cli-core
pexpect==4.6.0
pbr==3.1.1 # via keystoneauth1, openstacksdk, os-service-types, shade, stevedore pbr==3.1.1 # via keystoneauth1, openstacksdk, os-service-types, shade, stevedore
pexpect==4.6.0
psphere==0.5.2 psphere==0.5.2
psutil==5.4.3 psutil==5.4.3
ptyprocess==0.5.2 # via pexpect ptyprocess==0.5.2 # via pexpect
@@ -95,7 +103,7 @@ requests-oauthlib==0.8.0 # via msrest
requests==2.15.1 requests==2.15.1
requestsexceptions==1.4.0 # via openstacksdk, os-client-config requestsexceptions==1.4.0 # via openstacksdk, os-client-config
s3transfer==0.1.13 # via boto3 s3transfer==0.1.13 # via boto3
secretstorage==2.3.1 secretstorage==2.3.1 # via keyring
shade==1.27.0 shade==1.27.0
six==1.11.0 # via azure-cli-core, bcrypt, cryptography, isodate, keystoneauth1, knack, munch, ntlm-auth, openstacksdk, ovirt-engine-sdk-python, packaging, pynacl, pyopenssl, python-dateutil, python-memcached, pyvmomi, pywinrm, stevedore six==1.11.0 # via azure-cli-core, bcrypt, cryptography, isodate, keystoneauth1, knack, munch, ntlm-auth, openstacksdk, ovirt-engine-sdk-python, packaging, pynacl, pyopenssl, python-dateutil, python-memcached, pyvmomi, pywinrm, stevedore
stevedore==1.28.0 # via keystoneauth1 stevedore==1.28.0 # via keystoneauth1

1
requirements/requirements_ansible_git.txt
View File

@@ -1 +0,0 @@
git+https://github.com/ansible/docutils.git@master#egg=docutils

1
requirements/requirements_git.txt
View File

@@ -2,4 +2,3 @@ git+https://github.com/ansible/ansiconv.git@tower_1.0.0#egg=ansiconv
git+https://github.com/ansible/django-qsstats-magic.git@tower_0.7.2#egg=django-qsstats-magic git+https://github.com/ansible/django-qsstats-magic.git@tower_0.7.2#egg=django-qsstats-magic
git+https://github.com/ansible/dm.xmlsec.binding.git@master#egg=dm.xmlsec.binding git+https://github.com/ansible/dm.xmlsec.binding.git@master#egg=dm.xmlsec.binding
git+https://github.com/ansible/django-jsonbfield@fix-sqlite_serialization#egg=jsonbfield git+https://github.com/ansible/django-jsonbfield@fix-sqlite_serialization#egg=jsonbfield
git+https://github.com/ansible/docutils.git@master#egg=docutils