Skip to content

Commit

Permalink
General upgrade of dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlanCoding
AlanCoding committed Apr 11, 2019
1 parent 53ff0a0 commit 782b7b7
Show file tree
Hide file tree
Showing 6 changed files with 97 additions and 90 deletions.
6 changes: 3 additions & 3 deletions awx/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
# This line exists to make sure we don't regress on FIPS support if we
# upgrade Django; if you're upgrading Django and see this error,
# update the version check below, and confirm that FIPS still works.
if django.__version__ != '1.11.16':
raise RuntimeError("Django version other than 1.11.16 detected {}. \
Subclassing BaseDatabaseSchemaEditor is known to work for Django 1.11.16 \
if django.__version__ != '1.11.20':
raise RuntimeError("Django version other than 1.11.20 detected {}. \
Subclassing BaseDatabaseSchemaEditor is known to work for Django 1.11.20 \
and may not work in newer Django versions.".format(django.__version__))


Expand Down
6 changes: 3 additions & 3 deletions awx/wsgi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
still works".format(social_django.__version__))


if django.__version__ != '1.11.16':
raise RuntimeError("Django version other than 1.11.16 detected {}. \
if django.__version__ != '1.11.20':
raise RuntimeError("Django version other than 1.11.20 detected {}. \
Inherit from WSGIHandler to support short-circuit Django Middleware. \
This is known to work for Django 1.11.16 and may not work with other, \
This is known to work for Django 1.11.20 and may not work with other, \
even minor, versions.".format(django.__version__))


Expand Down
12 changes: 9 additions & 3 deletions requirements/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ NOTE: before running `pip-compile`, please copy-paste contents in `requirements/

At the end of `requirements/requirements.in`, pip and setuptools need to have their versions pinned.

Run these commands from the root of the awx repo.

```
python3 -m venvpip install pip-tools /buildit
python3 -m venv /buildit
source /buildit/bin/activate
pip install pip-tools
pip install pip --upgrade
Expand All @@ -16,8 +18,12 @@ pip-compile requirements/requirements_ansible.in > requirements/requirements_ans

## Known Issues

* Remove the `-e` from packages of the form `-e git+https://github.com...` in the generated `.txt`. Failure to do so will result in a "bad" RPM and DEB due to the `pip install` laying down a symbolic link with an absolute path from the virtualenv to the git repository that will differ from when the RPM and DEB are build to when the RPM and DEB are installed on a machine. By removing the `-e` the symbolic egg link will not be created and all is well.

* 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
* all dependencies are NOT captured in our `.txt` files. This means you can't rely on the `.txt` when gathering licenses.

* Both pip and setuptools need to be added back into `requirements_ansible.txt`

* Python3 exceptions need to be re-added back to `requirements_ansible.txt`

* The pip-compile tool is known to error due to a pycurl dependency from ovirt-engine-sdk-python. Until this is resolved, you may need to manually remove the ovirt dependency before running the tool and add it back in once finished.
56 changes: 29 additions & 27 deletions requirements/requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,28 @@
# pip-compile requirements/requirements.in
#
adal==1.2.1 # via msrestazure
amqp==2.3.2 # via kombu
amqp==2.4.2 # via kombu
ansible-runner==1.3.1
appdirs==1.4.2
argparse==1.4.0 # via uwsgitop
asgi-amqp==1.1.3
asgiref==1.1.2
asn1crypto==0.24.0 # via cryptography
attrs==18.2.0 # via automat, service-identity, twisted
autobahn==19.2.1 # via daphne
attrs==19.1.0 # via automat, service-identity, twisted
autobahn==19.3.3 # via daphne
automat==0.7.0 # via twisted
azure-common==1.1.18 # via azure-keyvault
azure-keyvault==1.1.0
azure-nspkg==3.0.2 # via azure-keyvault
billiard==3.5.0.5 # via celery
boto==2.47.0
celery==4.2.1
certifi==2018.11.29 # via msrest, requests
cffi==1.12.1 # via cryptography
certifi==2019.3.9 # via msrest, requests
cffi==1.12.2 # via cryptography
channels==1.1.8
chardet==3.0.4 # via requests
constantly==15.1.0 # via twisted
cryptography==2.5 # via adal, azure-keyvault, pyopenssl
cryptography==2.6.1 # via adal, azure-keyvault, pyopenssl
daphne==1.3.0
defusedxml==0.5.0
django-auth-ldap==1.7.0
Expand All @@ -41,39 +41,41 @@ django-radius==1.3.3
django-solo==1.1.3
django-split-settings==0.3.0
django-taggit==0.22.2
django==1.11.16
django==1.11.20
djangorestframework-yaml==1.0.3
djangorestframework==3.7.7
docutils==0.14 # via python-daemon
future==0.16.0 # via django-radius
hyperlink==18.0.0 # via twisted
hyperlink==19.0.0 # via twisted
idna==2.8 # via hyperlink, requests
incremental==17.5.0 # via twisted
inflect==2.1.0 # via jaraco.itertools
irc==16.2
isodate==0.6.0 # via msrest, python3-saml
jaraco.classes==2.0 # via jaraco.collections
jaraco.collections==2.0 # via irc, jaraco.text
jaraco.collections==2.0 # via irc
jaraco.functools==2.0 # via irc, jaraco.text, tempora
jaraco.itertools==4.4.1 # via irc
jaraco.itertools==4.4.2 # via irc
jaraco.logging==2.0 # via irc
jaraco.stream==2.0 # via irc
jaraco.text==2.0 # via irc, jaraco.collections
jaraco.text==3.0 # via irc, jaraco.collections
jinja2==2.10
jsonpickle==1.1 # via asgi-amqp
jsonschema==2.6.0
kombu==4.2.1 # via asgi-amqp, celery
lxml==4.3.1 # via xmlsec
kombu==4.5.0 # via asgi-amqp, celery
lockfile==0.12.2 # via python-daemon
lxml==4.3.3 # via xmlsec
markdown==2.6.11
markupsafe==1.1.0 # via jinja2
more-itertools==6.0.0 # via irc, jaraco.functools, jaraco.itertools
markupsafe==1.1.1 # via jinja2
more-itertools==7.0.0 # via irc, jaraco.functools, jaraco.itertools
msgpack-python==0.5.6 # via asgi-amqp
msrest==0.6.4 # via azure-keyvault, msrestazure
msrest==0.6.6 # via azure-keyvault, msrestazure
msrestazure==0.6.0 # via azure-keyvault
netaddr==0.7.19 # via pyrad
oauthlib==2.0.6 # via django-oauth-toolkit, requests-oauthlib, social-auth-core
oauthlib==3.0.1 # via django-oauth-toolkit, requests-oauthlib, social-auth-core
ordereddict==1.1
pexpect==4.6.0
pkgconfig==1.4.0 # via xmlsec
pkgconfig==1.5.1 # via xmlsec
prometheus_client==0.6.0
psutil==5.4.3
psycopg2==2.7.3.2
Expand All @@ -88,35 +90,35 @@ pyopenssl==19.0.0 # via service-identity
pyparsing==2.2.0
pyrad==2.1 # via django-radius
pysocks==1.6.8 # via twilio
python-daemon==2.2.0 # via ansible-runner
python-daemon==2.2.0
python-dateutil==2.7.2
python-ldap==3.1.0 # via django-auth-ldap
python-ldap==3.2.0 # via django-auth-ldap
python-memcached==1.59
python-radius==1.0
python3-openid==3.1.0 # via social-auth-core
python3-saml==1.4.0
pytz==2018.9 # via celery, django, irc, tempora, twilio
pyyaml==3.13 # via djangorestframework-yaml
pytz==2019.1 # via celery, django, irc, tempora, twilio
pyyaml==5.1 # via ansible-runner, djangorestframework-yaml
requests-futures==0.9.7
requests-oauthlib==1.2.0 # via msrest, social-auth-core
requests[security]==2.21.0
requests==2.21.0
service-identity==17.0.0
simplejson==3.16.0 # via uwsgitop
six==1.12.0 # via asgi-amqp, asgiref, autobahn, automat, cryptography, django-extensions, irc, isodate, jaraco.classes, jaraco.collections, jaraco.itertools, jaraco.logging, jaraco.stream, pygerduty, pyhamcrest, pyopenssl, pyrad, python-dateutil, python-memcached, slackclient, social-auth-app-django, social-auth-core, tacacs-plus, tempora, twilio, txaio, websocket-client
six==1.12.0 # via ansible-runner, asgi-amqp, asgiref, autobahn, automat, cryptography, django-extensions, irc, isodate, jaraco.classes, jaraco.collections, jaraco.itertools, jaraco.logging, jaraco.stream, pygerduty, pyhamcrest, pyopenssl, pyrad, python-dateutil, python-memcached, slackclient, social-auth-app-django, social-auth-core, tacacs-plus, tempora, twilio, txaio, websocket-client
slackclient==1.1.2
social-auth-app-django==2.1.0
social-auth-core==3.0.0
tacacs_plus==1.0
tempora==1.14 # via irc, jaraco.logging
twilio==6.10.4
twisted==18.9.0 # via daphne
twisted==19.2.0 # via daphne
txaio==18.8.1 # via autobahn
typing==3.6.6 # via django-extensions
urllib3==1.24.1 # via requests
uwsgi==2.0.17
uwsgitop==0.10.0
vine==1.2.0 # via amqp
websocket-client==0.47.0 # via slackclient
vine==1.3.0 # via amqp
websocket-client==0.56.0 # via slackclient
xmlsec==1.3.3 # via python3-saml
zope.interface==4.6.0 # via twisted

Expand Down
4 changes: 2 additions & 2 deletions requirements/requirements_ansible.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ azure-graphrbac==0.40.0
# AWS
boto==2.47.0 # last which does not break ec2 scripts
boto3==1.6.2
google-auth==1.6.2 # needed for gce inventory imports
google-auth==1.6.2 # needed for gce inventory plugin imports, libcloud is git dependency
jinja2==2.10 # required for native jinja2 types for inventory compat mode
# netconf for network modules
ncclient==0.6.3
# netaddr filter
netaddr
# oVirt/RHV
# oVirt/RHV (see README about pip-compile problem)
ovirt-engine-sdk-python==4.2.4 # minimum set inside Ansible facts module requirements
# AWX usage
pexpect==4.6.0 # same as AWX requirement
Expand Down
103 changes: 51 additions & 52 deletions requirements/requirements_ansible.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
#
# pip-compile --output-file requirements/requirements_ansible.txt requirements/requirements_ansible.in
#
adal==0.5.0 # via msrestazure
adal==1.2.1 # via msrestazure
appdirs==1.4.3 # via openstacksdk, os-client-config
applicationinsights==0.11.1 # via azure-cli-core
argcomplete==1.9.4 # via azure-cli-core, knack
applicationinsights==0.11.8 # via azure-cli-core
argcomplete==1.9.5 # via azure-cli-core, knack
asn1crypto==0.24.0 # via cryptography
azure-cli-core==2.0.35
azure-cli-nspkg==3.0.2
Expand All @@ -34,87 +34,86 @@ azure-mgmt-web==0.32.0
azure-nspkg==2.0.0
azure-storage==0.35.1
backports.ssl-match-hostname==3.5.0.1
bcrypt==3.1.4 # via paramiko
bcrypt==3.1.6 # via paramiko
boto3==1.6.2
boto==2.47.0
botocore==1.9.3 # via boto3, s3transfer
cachetools==3.0.0 # via google-auth
certifi==2018.1.18 # via msrest, requests
cffi==1.11.5 # via bcrypt, cryptography, pynacl
botocore==1.9.23 # via boto3, s3transfer
cachetools==3.1.0 # via google-auth
certifi==2019.3.9 # via msrest, requests
cffi==1.12.2 # via bcrypt, cryptography, pynacl
chardet==3.0.4 # via requests
colorama==0.3.9 # via azure-cli-core, knack
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
deprecation==2.0 # via openstacksdk
colorama==0.4.1 # via azure-cli-core, knack
configparser==3.7.4 # via entrypoints
cryptography==2.6.1 # via adal, azure-keyvault, azure-storage, openstacksdk, paramiko, pyopenssl, requests-kerberos, requests-ntlm, secretstorage
decorator==4.4.0 # via dogpile.cache, openstacksdk
docutils==0.14 # via botocore
dogpile.cache==0.6.5 # via openstacksdk
entrypoints==0.2.3 # via keyring
dogpile.cache==0.7.1 # via openstacksdk
entrypoints==0.3 # via keyring
enum34==1.1.6; python_version < '3' # via cryptography, knack, msrest, ovirt-engine-sdk-python
futures==3.2.0; python_version < '3' # via openstacksdk, s3transfer
google-auth==1.6.2
humanfriendly==4.8 # via azure-cli-core
idna==2.6 # via cryptography, requests
ipaddress==1.0.19 # via cryptography, openstacksdk
humanfriendly==4.18 # via azure-cli-core
idna==2.8 # via requests
ipaddress==1.0.22 # via cryptography, openstacksdk
iso8601==0.1.12 # via keystoneauth1, openstacksdk
isodate==0.6.0 # via msrest
jinja2==2.10
jmespath==0.9.3 # via azure-cli-core, boto3, botocore, knack, openstacksdk
jsonpatch==1.21 # via openstacksdk
jmespath==0.9.4 # via azure-cli-core, boto3, botocore, knack, openstacksdk
jsonpatch==1.23 # via openstacksdk
jsonpointer==2.0 # via jsonpatch
keyring==15.1.0 # via msrestazure
keystoneauth1==3.11.2 # via openstacksdk, os-client-config
keyring==18.0.1 # via msrestazure
keystoneauth1==3.13.1 # via openstacksdk
knack==0.3.3 # via azure-cli-core
lxml==4.1.1 # via ncclient, pyvmomi
monotonic==1.4 # via humanfriendly
lxml==4.3.3 # via ncclient, pyvmomi
markupsafe==1.1.1 # via jinja2
monotonic==1.5 # via humanfriendly
msrest==0.4.29
msrestazure==0.4.31
munch==2.2.0 # via openstacksdk
munch==2.3.2 # via openstacksdk
ncclient==0.6.3
netaddr==0.7.19
netifaces==0.10.6 # via openstacksdk
ntlm-auth==1.0.6 # via requests-credssp, requests-ntlm
oauthlib==2.0.6 # via requests-oauthlib
netifaces==0.10.9 # via openstacksdk
ntlm-auth==1.3.0 # via requests-credssp, requests-ntlm
oauthlib==3.0.1 # via requests-oauthlib
openstacksdk==0.23.0
os-service-types==1.2.0 # via openstacksdk
os-service-types==1.6.0 # via keystoneauth1, openstacksdk
ovirt-engine-sdk-python==4.2.4
packaging==17.1
paramiko==2.4.0 # via azure-cli-core, ncclient
pbr==3.1.1 # via keystoneauth1, openstacksdk, os-service-types, stevedore
packaging==19.0
paramiko==2.4.2 # via azure-cli-core, ncclient
pbr==5.1.3 # via keystoneauth1, openstacksdk, os-service-types, stevedore
pexpect==4.6.0
psutil==5.4.3
ptyprocess==0.5.2 # via pexpect
pyasn1-modules==0.2.3 # via google-auth
pyasn1==0.4.2 # via paramiko
pycparser==2.18 # via cffi
pycurl==7.43.0.1 # via ovirt-engine-sdk-python
pygments==2.2.0 # via azure-cli-core, knack
pyjwt==1.6.0 # via adal, azure-cli-core
ptyprocess==0.6.0 # via pexpect
pyasn1-modules==0.2.4 # via google-auth
pyasn1==0.4.5 # via paramiko, pyasn1-modules, rsa
pycparser==2.19 # via cffi
pygments==2.3.1 # via azure-cli-core, knack
pyjwt==1.7.1 # via adal, azure-cli-core
pykerberos==1.2.1 # via requests-kerberos
pynacl==1.2.1 # via paramiko
pyopenssl==17.5.0 # via azure-cli-core, pyvmomi, requests-credssp
pyparsing==2.2.0 # via packaging
pynacl==1.3.0 # via paramiko
pyopenssl==19.0.0 # via azure-cli-core, pyvmomi, requests-credssp
pyparsing==2.4.0 # via packaging
pycurl==7.43.0.1 # via ovirt-engine-sdk-python
python-dateutil==2.6.1 # via adal, azure-storage, botocore
pyvmomi==6.5
pywinrm[kerberos]==0.3.0
pyyaml==3.12 # via azure-cli-core, knack, openstacksdk, os-client-config
pyyaml==5.1 # via azure-cli-core, knack, openstacksdk
requests-credssp==0.1.0
requests-kerberos==0.12.0 # via pywinrm
requests-ntlm==1.1.0 # via pywinrm
requests-oauthlib==0.8.0 # via msrest
requests==2.20.0
requestsexceptions==1.4.0 # via openstacksdk, os-client-config
requests-oauthlib==1.2.0 # via msrest
requests==2.21.0
requestsexceptions==1.4.0 # via openstacksdk
rsa==4.0 # via google-auth
s3transfer==0.1.13 # via boto3
secretstorage==2.3.1 # via keyring
selectors2==2.0.1 # via ncclient

six==1.11.0 # via azure-cli-core, bcrypt, cryptography, google-auth, isodate, keystoneauth1, knack, munch, ncclient, ntlm-auth, openstacksdk, ovirt-engine-sdk-python, packaging, pynacl, pyopenssl, python-dateutil, pyvmomi, pywinrm, stevedore
stevedore==1.28.0 # via keystoneauth1
tabulate==0.7.7 # via azure-cli-core, knack
urllib3==1.24 # via requests
six==1.12.0 # via azure-cli-core, bcrypt, cryptography, google-auth, isodate, keystoneauth1, knack, munch, ncclient, openstacksdk, ovirt-engine-sdk-python, packaging, pynacl, pyopenssl, python-dateutil, pyvmomi, pywinrm, stevedore
stevedore==1.30.1 # via keystoneauth1
tabulate==0.8.2 # via azure-cli-core, knack
urllib3==1.24.1 # via requests
wheel==0.30.0 # via azure-cli-core
xmltodict==0.11.0 # via pywinrm
xmltodict==0.12.0 # via pywinrm

# The following packages are considered to be unsafe in a requirements file:
pip==9.0.1
Expand Down

0 comments on commit 782b7b7

Please sign in to comment.