From 7f02e64a0d15fa0f5f8cbc4b94b37cce7c99c24c Mon Sep 17 00:00:00 2001 From: chris meyers Date: Thu, 19 Mar 2020 10:19:07 -0400 Subject: [PATCH] fix redis requirements mess * Add the end of the redis PR we rebased devel a bunch. requirements snuck into requirements.txt this way. This PR removes those requirements (i.e. kombu) and bumps other requirements. --- requirements/requirements.txt | 95 +++++++++++++++++------------------ 1 file changed, 46 insertions(+), 49 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index c470456a5f..a046cf2768 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,33 +1,32 @@ adal==1.2.2 # via msrestazure aiohttp==3.6.2 aioredis==1.3.1 # via channels-redis -amqp==2.5.2 # via kombu ansible-runner==1.4.4 ansiconv==1.0.0 -asgiref==3.2.3 # via channels, channels-redis, daphne +asgiref==3.2.5 # via channels, channels-redis, daphne async-timeout==3.0.1 # via aiohttp, aioredis attrs==19.3.0 # via aiohttp, automat, jsonschema, service-identity, twisted -autobahn==20.1.2 # via daphne -automat==0.8.0 # via twisted -azure-common==1.1.24 # via azure-keyvault +autobahn==20.3.1 # via daphne +automat==20.2.0 # via twisted +azure-common==1.1.25 # via azure-keyvault azure-keyvault==1.1.0 azure-nspkg==3.0.2 # via azure-keyvault boto==2.49.0 cachetools==4.0.0 # via google-auth certifi==2019.11.28 # via kubernetes, msrest, requests -cffi==1.13.2 # via cryptography -channels-redis==2.4.1 -channels==2.4.0 +cffi==1.14.0 # via cryptography +channels-redis==2.4.2 +channels==2.4.0 # channels-redis chardet==3.0.4 # via aiohttp, requests constantly==15.1.0 # via twisted cryptography==2.8 # via adal, autobahn, azure-keyvault, pyopenssl, service-identity -daphne==2.4.1 +daphne==2.4.1 # channels defusedxml==0.6.0 # via python3-openid, python3-saml, social-auth-core dictdiffer==0.8.1 # via openshift django-auth-ldap==2.1.0 django-cors-headers==3.2.1 django-crum==0.7.5 -django-extensions==2.2.5 +django-extensions==2.2.8 django-jsonfield==1.2.0 django-oauth-toolkit==1.1.3 django-pglocks==1.0.4 @@ -37,20 +36,20 @@ django-radius==1.3.3 django-solo==1.1.3 django-split-settings==1.0.0 django-taggit==1.2.0 -django==2.2.10 +django==2.2.10 # channels, django-auth-ldap, django-cors-headers, django-crum, django-jsonfield, django-oauth-toolkit, django-polymorphic, django-taggit, djangorestframework djangorestframework-yaml==1.0.3 djangorestframework==3.11.0 -docutils==0.15.2 # via python-daemon +docutils==0.16 # via python-daemon future==0.16.0 # via django-radius -gitdb2==2.0.6 # via gitpython -gitpython==3.0.5 -google-auth==1.10.0 # via kubernetes +gitdb==4.0.2 # via gitpython +gitpython==3.1.0 +google-auth==1.11.3 # via kubernetes hiredis==1.0.1 # via aioredis hyperlink==19.0.0 # via twisted idna-ssl==1.1.0 # via aiohttp -idna==2.8 # via hyperlink, idna-ssl, requests, twisted, yarl -importlib-metadata==1.4.0 # via irc, jsonschema, kombu -importlib-resources==1.0.2 # via jaraco.text +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 irc==18.0.0 isodate==0.6.0 # via msrest, python3-saml @@ -60,79 +59,77 @@ jaraco.functools==3.0.0 # via irc, jaraco.text, tempora jaraco.logging==3.0.0 # via irc jaraco.stream==3.0.0 # via irc jaraco.text==3.2.0 # via irc, jaraco.collections -jinja2==2.10.3 +jinja2==2.11.1 # openshift jsonschema==3.2.0 -kombu==4.6.7 # via asgi-amqp -kubernetes==10.0.1 # via openshift +kubernetes==10.1.0 # via openshift lockfile==0.12.2 # via python-daemon -lxml==4.4.2 # via xmlsec -markdown==3.1.1 +lxml==4.5.0 # via xmlsec +markdown==3.2.1 markupsafe==1.1.1 # via jinja2 -more-itertools==8.1.0 # via irc, jaraco.classes, jaraco.functools, zipp +more-itertools==8.2.0 # via irc, jaraco.classes, jaraco.functools msgpack==0.6.2 # via channels-redis -msrest==0.6.10 # via azure-keyvault, msrestazure -msrestazure==0.6.2 # via azure-keyvault -multidict==4.7.4 # via aiohttp, yarl +msrest==0.6.11 # via azure-keyvault, msrestazure +msrestazure==0.6.3 # via azure-keyvault +multidict==4.7.5 # via aiohttp, yarl netaddr==0.7.19 # via pyrad oauthlib==3.1.0 # via django-oauth-toolkit, requests-oauthlib, social-auth-core -openshift==0.10.1 -pexpect==4.7.0 # via ansible-runner +openshift==0.10.3 +pexpect==4.8.0 # via ansible-runner pkgconfig==1.5.1 # via xmlsec prometheus-client==0.7.1 -psutil==5.6.7 # via ansible-runner +psutil==5.7.0 # via ansible-runner psycopg2==2.8.4 ptyprocess==0.6.0 # via pexpect pyasn1-modules==0.2.8 # via google-auth, python-ldap, service-identity pyasn1==0.4.8 # via pyasn1-modules, python-ldap, rsa, service-identity -pycparser==2.19 # via cffi +pycparser==2.20 # via cffi pygerduty==0.38.2 -pyhamcrest==1.9.0 # via twisted +pyhamcrest==2.0.2 # via twisted pyjwt==1.7.1 # via adal, social-auth-core, twilio pyopenssl==19.1.0 # via twisted pyparsing==2.4.6 -pyrad==2.2 # via django-radius +pyrad==2.3 # via django-radius pyrsistent==0.15.7 # via jsonschema python-daemon==2.2.4 # via ansible-runner python-dateutil==2.8.1 # via adal, kubernetes python-ldap==3.2.0 # via django-auth-ldap python-memcached==1.59 python-radius==1.0 -python-string-utils==0.6.0 # via openshift +python-string-utils==1.0.0 # via openshift python3-openid==3.1.0 # via social-auth-core python3-saml==1.9.0 pytz==2019.3 # via django, irc, tempora, twilio -pyyaml==5.3 # via ansible-runner, djangorestframework-yaml, kubernetes -redis==3.3.11 +pyyaml==3.13 # via ansible-runner, djangorestframework-yaml, kubernetes +redis==3.4.1 requests-futures==1.0.0 requests-oauthlib==1.3.0 # via kubernetes, msrest, social-auth-core -requests==2.22.0 +requests==2.23.0 # adal, azure-keyvault, django-oauth-toolkit, kubernetes, msrest, requests-futures, requests-oauthlib, slackclient, social-auth-core, twilio rsa==4.0 # via google-auth ruamel.yaml.clib==0.2.0 # via ruamel.yaml -ruamel.yaml==0.16.5 # via openshift +ruamel.yaml==0.16.10 # via openshift schedule==0.6.0 service-identity==18.1.0 # via twisted -six==1.13.0 # via ansible-runner, asgi-amqp, asgiref, autobahn, automat, cryptography, django-extensions, google-auth, isodate, jaraco.classes, jaraco.collections, jaraco.itertools, jaraco.logging, jaraco.text, jsonschema, kubernetes, openshift, pygerduty, pyhamcrest, pyrad, pyrsistent, python-dateutil, python-memcached, slackclient, social-auth-app-django, social-auth-core, tacacs-plus, tempora, twilio, txaio, websocket-client +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, python-memcached, slackclient, social-auth-app-django, social-auth-core, tacacs-plus, twilio, txaio, websocket-client slackclient==1.1.2 -smmap2==2.0.5 # via gitdb2 +smmap==3.0.1 # via gitdb social-auth-app-django==3.1.0 -social-auth-core==3.2.0 -sqlparse==0.3.0 # via django +social-auth-core==3.2.0 # social-auth-app-django +sqlparse==0.3.1 # via django tacacs_plus==1.0 tempora==2.1.0 # via irc, jaraco.logging -twilio==6.35.2 +twilio==6.37.0 twisted[tls]==19.10.0 # via daphne -txaio==18.8.1 # via autobahn +txaio==20.1.1 # via autobahn typing-extensions==3.7.4.1 # via aiohttp -urllib3==1.25.7 # via kubernetes, requests +urllib3==1.25.8 # via kubernetes, requests uwsgi==2.0.18 uwsgitop==0.11 -vine==1.3.0 # via amqp websocket-client==0.57.0 # via kubernetes, slackclient xmlsec==1.3.3 # via python3-saml yarl==1.4.2 # via aiohttp -zipp==1.0.0 # via importlib-metadata -zope.interface==4.7.1 # via twisted +zipp==3.1.0 # via importlib-metadata, importlib-resources +zope.interface==5.0.0 # via twisted # The following packages are considered to be unsafe in a requirements file: pip==19.3.1 -setuptools==41.6.0 +setuptools==41.6.0 # google-auth, jsonschema, kubernetes, markdown, python-daemon, zope.interface