diff --git a/docs/licenses/pysocks.txt b/docs/licenses/pysocks.txt new file mode 100644 index 0000000000..04b6b1f37c --- /dev/null +++ b/docs/licenses/pysocks.txt @@ -0,0 +1,22 @@ +Copyright 2006 Dan-Haim. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +3. Neither the name of Dan Haim nor the names of his contributors may be used + to endorse or promote products derived from this software without specific + prior written permission. + +THIS SOFTWARE IS PROVIDED BY DAN HAIM "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL DAN HAIM OR HIS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMANGE. diff --git a/docs/licenses/python-openid.txt b/docs/licenses/python3-openid.txt similarity index 100% rename from docs/licenses/python-openid.txt rename to docs/licenses/python3-openid.txt diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 386b10b9da..e6379ca007 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -38,7 +38,6 @@ django==1.11.16 djangorestframework-yaml==1.0.3 djangorestframework==3.7.7 docutils==0.14 # via botocore -enum34==1.1.6 # via cryptography hyperlink==18.0.0 # via twisted idna==2.6 # via cryptography, hyperlink, requests incremental==17.5.0 # via twisted @@ -76,11 +75,12 @@ pygerduty==0.37.0 pyjwt==1.6.0 # via social-auth-core, twilio pyparsing==2.2.0 pyrad==2.1 # via django-radius +pysocks==1.6.8 python-dateutil==2.7.2 python-ldap==3.1.0 # via django-auth-ldap python-logstash==0.4.6 python-memcached==1.59 -python-openid==2.2.5 # via social-auth-core +python3-openid>=3.0.10 # via social-auth-core python-radius==1.0 python3-saml==1.4.0 pytz==2018.5 # via celery, django, irc, tempora, twilio