From af4234556ee65a3f2ab35c53b582816446b06b56 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Thu, 3 Jan 2019 15:31:39 -0500 Subject: [PATCH] remove dm.xmlsec.binding python-saml uses dm.xmlsec.binding only supports python2 by moving to py3, we now use python3-saml (which uses python-xmlsec instead) see: https://github.com/onelogin/python-saml/issues/145#issuecomment-222021691 --- awx/sso/__init__.py | 26 -------------------------- docs/licenses/dm.xmlsec.binding.txt | 20 -------------------- requirements/requirements_git.txt | 1 - 3 files changed, 47 deletions(-) delete mode 100644 docs/licenses/dm.xmlsec.binding.txt diff --git a/awx/sso/__init__.py b/awx/sso/__init__.py index a116066211..bb4e958844 100644 --- a/awx/sso/__init__.py +++ b/awx/sso/__init__.py @@ -1,30 +1,4 @@ # Copyright (c) 2015 Ansible, Inc. # All Rights Reserved. -# Python -import threading - -# Monkeypatch xmlsec.initialize() to only run once (https://github.com/ansible/ansible-tower/issues/3241). -xmlsec_init_lock = threading.Lock() -xmlsec_initialized = False - - -# -# TODO: THIS DOES NOT WORK IN PY3 -# -#import dm.xmlsec.binding # noqa -#original_xmlsec_initialize = dm.xmlsec.binding.initialize -# -# -#def xmlsec_initialize(*args, **kwargs): -# global xmlsec_init_lock, xmlsec_initialized, original_xmlsec_initialize -# with xmlsec_init_lock: -# if not xmlsec_initialized: -# original_xmlsec_initialize(*args, **kwargs) -# xmlsec_initialized = True -# -# -#dm.xmlsec.binding.initialize = xmlsec_initialize - - default_app_config = 'awx.sso.apps.SSOConfig' diff --git a/docs/licenses/dm.xmlsec.binding.txt b/docs/licenses/dm.xmlsec.binding.txt deleted file mode 100644 index 4f721b9ad5..0000000000 --- a/docs/licenses/dm.xmlsec.binding.txt +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (C) 2012-2013 by Dr. Dieter Maurer -D-66571 Bubach, Illtalstr. 25, Germany - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice, this permission -notice and the warranties disclaimer below -appear in all copies, modified copies and in -supporting documentation. - -Dieter Maurer DISCLAIMS ALL WARRANTIES WITH -REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL Dieter Maurer -BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt index 9ba48b14ff..46953643f7 100644 --- a/requirements/requirements_git.txt +++ b/requirements/requirements_git.txt @@ -1,4 +1,3 @@ git+https://github.com/ansible/ansiconv.git@tower_1.0.0#egg=ansiconv git+https://github.com/ansible/django-qsstats-magic.git@py3#egg=django-qsstats-magic -git+https://github.com/ryanpetrello/dm.xmlsec.binding.git@master#egg=dm.xmlsec.binding git+https://github.com/ansible/django-jsonbfield@fix-sqlite_serialization#egg=jsonbfield