From 04622d5786770645cffa5fe8eb7d7d4bd141689e Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Wed, 20 Feb 2019 08:26:41 -0500 Subject: [PATCH] remove redbaron and update dependencies --- awx/conf/utils.py | 108 +----------- docs/licenses/baron.txt | 165 ------------------ docs/licenses/future.txt | 19 ++ docs/licenses/pkgconfig.txt | 19 ++ docs/licenses/pyhamcrest.txt | 27 +++ docs/licenses/redbaron.txt | 165 ------------------ docs/licenses/rply.txt | 27 --- docs/licenses/vine.txt | 52 ++++++ docs/licenses/xmlsec.txt | 21 +++ requirements/README.md | 2 +- requirements/requirements.in | 3 +- requirements/requirements.txt | 97 +++++----- requirements/requirements_tower_uninstall.txt | 1 + 13 files changed, 191 insertions(+), 515 deletions(-) delete mode 100644 docs/licenses/baron.txt create mode 100644 docs/licenses/future.txt create mode 100644 docs/licenses/pkgconfig.txt create mode 100644 docs/licenses/pyhamcrest.txt delete mode 100644 docs/licenses/redbaron.txt delete mode 100644 docs/licenses/rply.txt create mode 100644 docs/licenses/vine.txt create mode 100644 docs/licenses/xmlsec.txt diff --git a/awx/conf/utils.py b/awx/conf/utils.py index cb89feef6cd1..0b2ce9b738f0 100755 --- a/awx/conf/utils.py +++ b/awx/conf/utils.py @@ -1,108 +1,9 @@ #!/usr/bin/env python -# Python -import difflib -import glob -import os -import shutil - # AWX from awx.conf.registry import settings_registry -__all__ = ['comment_assignments', 'conf_to_dict'] - - -def comment_assignments(patterns, assignment_names, dry_run=True, backup_suffix='.old'): - if isinstance(patterns, str): - patterns = [patterns] - diffs = [] - for pattern in patterns: - for filename in sorted(glob.glob(pattern)): - filename = os.path.abspath(os.path.normpath(filename)) - if backup_suffix: - backup_filename = '{}{}'.format(filename, backup_suffix) - else: - backup_filename = None - diff = comment_assignments_in_file(filename, assignment_names, dry_run, backup_filename) - if diff: - diffs.append(diff) - return diffs - - -def comment_assignments_in_file(filename, assignment_names, dry_run=True, backup_filename=None): - from redbaron import RedBaron, indent - - if isinstance(assignment_names, str): - assignment_names = [assignment_names] - else: - assignment_names = assignment_names[:] - current_file_data = open(filename).read() - - for assignment_name in assignment_names[:]: - if assignment_name in current_file_data: - continue - if assignment_name in assignment_names: - assignment_names.remove(assignment_name) - if not assignment_names: - return '' - - replace_lines = {} - rb = RedBaron(current_file_data) - for assignment_node in rb.find_all('assignment'): - for assignment_name in assignment_names: - - # Only target direct assignments to a variable. - name_node = assignment_node.find('name', value=assignment_name) - if not name_node: - continue - if assignment_node.target.type != 'name': - continue - - # Build a new node that comments out the existing assignment node. - indentation = '{}# '.format(assignment_node.indentation or '') - new_node_content = indent(assignment_node.dumps(), indentation) - new_node_lines = new_node_content.splitlines() - # Add a pass statement in case the assignment block is the only - # child in a parent code block to prevent a syntax error. - if assignment_node.indentation: - new_node_lines[0] = new_node_lines[0].replace(indentation, '{}pass # '.format(assignment_node.indentation or ''), 1) - new_node_lines[0] = '{0}This setting is now configured via the Tower API.\n{1}'.format(indentation, new_node_lines[0]) - - # Store new node lines in dictionary to be replaced in file. - start_lineno = assignment_node.absolute_bounding_box.top_left.line - end_lineno = assignment_node.absolute_bounding_box.bottom_right.line - for n, new_node_line in enumerate(new_node_lines): - new_lineno = start_lineno + n - assert new_lineno <= end_lineno - replace_lines[new_lineno] = new_node_line - - if not replace_lines: - return '' - - # Iterate through all lines in current file and replace as needed. - current_file_lines = current_file_data.splitlines() - new_file_lines = [] - for n, line in enumerate(current_file_lines): - new_file_lines.append(replace_lines.get(n + 1, line)) - new_file_data = '\n'.join(new_file_lines) - new_file_lines = new_file_data.splitlines() - - # If changed, syntax check and write the new file; return a diff of changes. - diff_lines = [] - if new_file_data != current_file_data: - compile(new_file_data, filename, 'exec') - if backup_filename: - from_file = backup_filename - else: - from_file = '{}.old'.format(filename) - to_file = filename - diff_lines = list(difflib.unified_diff(current_file_lines, new_file_lines, fromfile=from_file, tofile=to_file, lineterm='')) - if not dry_run: - if backup_filename: - shutil.copy2(filename, backup_filename) - with open(filename, 'w') as fileobj: - fileobj.write(new_file_data) - return '\n'.join(diff_lines) +__all__ = ['conf_to_dict'] def conf_to_dict(obj): @@ -110,10 +11,3 @@ def conf_to_dict(obj): 'category': settings_registry.get_setting_category(obj.key), 'name': obj.key, } - - -if __name__ == '__main__': - pattern = os.path.join(os.path.dirname(__file__), '..', 'settings', 'local_*.py') - diffs = comment_assignments(pattern, ['AUTH_LDAP_ORGANIZATION_MAP']) - for diff in diffs: - print(diff) diff --git a/docs/licenses/baron.txt b/docs/licenses/baron.txt deleted file mode 100644 index 65c5ca88a67c..000000000000 --- a/docs/licenses/baron.txt +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/docs/licenses/future.txt b/docs/licenses/future.txt new file mode 100644 index 000000000000..c4dfd4b01338 --- /dev/null +++ b/docs/licenses/future.txt @@ -0,0 +1,19 @@ +Copyright (c) 2013-2016 Python Charmers Pty Ltd, Australia + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/docs/licenses/pkgconfig.txt b/docs/licenses/pkgconfig.txt new file mode 100644 index 000000000000..716f12754d48 --- /dev/null +++ b/docs/licenses/pkgconfig.txt @@ -0,0 +1,19 @@ +Copyright (c) 2013 Matthias Vogelgesang + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/docs/licenses/pyhamcrest.txt b/docs/licenses/pyhamcrest.txt new file mode 100644 index 000000000000..0bea089e5cac --- /dev/null +++ b/docs/licenses/pyhamcrest.txt @@ -0,0 +1,27 @@ +BSD License + +Copyright 2011 hamcrest.org +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of +conditions and the following disclaimer. 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. + +Neither the name of Hamcrest nor the names of its contributors may be used to endorse +or promote products derived from this software without specific prior written +permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT OWNER OR 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, WHETHER IN +CONTRACT, STRICT 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 +DAMAGE. diff --git a/docs/licenses/redbaron.txt b/docs/licenses/redbaron.txt deleted file mode 100644 index 65c5ca88a67c..000000000000 --- a/docs/licenses/redbaron.txt +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/docs/licenses/rply.txt b/docs/licenses/rply.txt deleted file mode 100644 index ef355c032a07..000000000000 --- a/docs/licenses/rply.txt +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) Alex Gaynor and individual contributors. -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 rply nor the names of its contributors may be used - to endorse or promote products derived from this software without - specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT OWNER OR 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, WHETHER IN CONTRACT, STRICT 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 DAMAGE. diff --git a/docs/licenses/vine.txt b/docs/licenses/vine.txt new file mode 100644 index 000000000000..0a949125133e --- /dev/null +++ b/docs/licenses/vine.txt @@ -0,0 +1,52 @@ +Copyright (c) 2015-2016 Ask Solem & contributors. All rights reserved. + +Vine is licensed under The BSD License (3 Clause, also known as +the new BSD license). The license is an OSI approved Open Source +license and is GPL-compatible(1). + +The license text can also be found here: +http://www.opensource.org/licenses/BSD-3-Clause + +License +======= + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * 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. + * Neither the name of Ask Solem, nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 Ask Solem OR 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, WHETHER IN +CONTRACT, STRICT 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 DAMAGE. + +Documentation License +===================== + +The documentation portion of Vine (the rendered contents of the +"docs" directory of a software distribution or checkout) is supplied +under the "Creative Commons Attribution-ShareAlike 4.0 +International" (CC BY-SA 4.0) License as described by +http://creativecommons.org/licenses/by-sa/4.0/ + +Footnotes +========= +(1) A GPL-compatible license makes it possible to + combine Vine with other software that is released + under the GPL, it does not mean that we're distributing + Vine under the GPL license. The BSD license, unlike the GPL, + let you distribute a modified version without making your + changes open source. diff --git a/docs/licenses/xmlsec.txt b/docs/licenses/xmlsec.txt new file mode 100644 index 000000000000..89ba0cdd01d8 --- /dev/null +++ b/docs/licenses/xmlsec.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 Ryan Leckey + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/requirements/README.md b/requirements/README.md index 1fa993520633..0d3c241b3011 100644 --- a/requirements/README.md +++ b/requirements/README.md @@ -5,7 +5,7 @@ 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. ``` -virtualenv /buildit +python3 -m venvpip install pip-tools /buildit source /buildit/bin/activate pip install pip-tools pip install pip --upgrade diff --git a/requirements/requirements.in b/requirements/requirements.in index 8e5abd66ca17..04b68a511ccb 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -22,7 +22,7 @@ django-taggit==0.22.2 djangorestframework==3.7.7 djangorestframework-yaml==1.0.3 irc==16.2 -jinja2=2.10 +jinja2==2.10 jsonschema==2.6.0 Markdown==2.6.11 # used for formatting API help ordereddict==1.1 @@ -38,7 +38,6 @@ python-radius==1.0 python3-saml==1.4.0 social-auth-core==3.0.0 social-auth-app-django==2.1.0 -redbaron==0.6.3 requests<2.16 # Older versions rely on certify requests-futures==0.9.7 service-identity==17.0.0 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index df1b209db54a..eedd26c36956 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file requirements/requirements.txt requirements/requirements.in +# pip-compile requirements/requirements.in # amqp==2.3.2 # via kombu appdirs==1.4.2 @@ -10,20 +10,20 @@ argparse==1.4.0 # via uwsgitop asgi-amqp==1.1.3 asgiref==1.1.2 asn1crypto==0.24.0 # via cryptography -attrs==17.4.0 # via automat, service-identity -autobahn==18.3.1 # via daphne -automat==0.6.0 # via twisted -baron==0.6.6 # via redbaron -billiard==3.5.0.4 # via celery +attrs==18.2.0 # via automat, service-identity, twisted +autobahn==19.2.1 # via daphne +automat==0.7.0 # via twisted +billiard==3.5.0.5 # via celery boto==2.47.0 celery==4.2.1 -cffi==1.11.5 # via cryptography +cffi==1.12.1 # via cryptography channels==1.1.8 constantly==15.1.0 # via twisted -cryptography==2.3.1 # via requests +cryptography==2.5 # via pyopenssl daphne==1.3.0 -defusedxml==0.5.0 # via python3-saml +defusedxml==0.5.0 django-auth-ldap==1.7.0 +django-cors-headers==2.4.0 django-crum==0.7.2 django-extensions==2.0.0 django-jsonfield==1.0.1 @@ -37,77 +37,78 @@ django-taggit==0.22.2 django==1.11.16 djangorestframework-yaml==1.0.3 djangorestframework==3.7.7 -docutils==0.14 # via botocore +future==0.16.0 # via django-radius hyperlink==18.0.0 # via twisted -idna==2.6 # via cryptography, hyperlink, requests +idna==2.8 # via hyperlink incremental==17.5.0 # via twisted -inflect==0.2.5 # via jaraco.itertools -ipaddress==1.0.19 # via cryptography +inflect==2.1.0 # via jaraco.itertools irc==16.2 -isodate==0.6.0 # via python-saml -jaraco.classes==1.4.3 # via jaraco.collections -jaraco.collections==1.5.3 # via irc, jaraco.text -jaraco.functools==1.17 # via irc, jaraco.text -jaraco.itertools==2.1.1 # via irc -jaraco.logging==1.5.1 # via irc -jaraco.stream==1.1.2 # via irc -jaraco.text==1.10 # via irc, jaraco.collections +isodate==0.6.0 # via python3-saml +jaraco.classes==2.0 # via jaraco.collections +jaraco.collections==2.0 # via irc, jaraco.text +jaraco.functools==2.0 # via irc, jaraco.text, tempora +jaraco.itertools==4.4.1 # via irc +jaraco.logging==2.0 # via irc +jaraco.stream==2.0 # via irc +jaraco.text==2.0 # via irc, jaraco.collections jinja2==2.10 -jsonpickle==0.9.6 # via asgi-amqp +jsonpickle==1.1 # via asgi-amqp jsonschema==2.6.0 kombu==4.2.1 # via asgi-amqp, celery -lxml==4.2.3 +lxml==4.3.1 # via xmlsec markdown==2.6.11 -MarkupSafe==1.0 # via jinja2 -more-itertools==4.1.0 # via irc, jaraco.functools, jaraco.itertools -msgpack-python==0.5.5 # via asgi-amqp +markupsafe==1.1.0 # via jinja2 +more-itertools==6.0.0 # via irc, jaraco.functools, jaraco.itertools +msgpack-python==0.5.6 # via asgi-amqp netaddr==0.7.19 # via pyrad oauthlib==2.0.6 # via django-oauth-toolkit, requests-oauthlib, social-auth-core ordereddict==1.1 pexpect==4.6.0 +pkgconfig==1.4.0 # via xmlsec psutil==5.4.3 psycopg2==2.7.3.2 -ptyprocess==0.5.2 # via pexpect -pyasn1-modules==0.2.1 # via service-identity -pyasn1==0.4.2 # via pyasn1-modules, service-identity -pycparser==2.18 # via cffi +ptyprocess==0.6.0 # via pexpect +pyasn1-modules==0.2.4 # via python-ldap, service-identity +pyasn1==0.4.5 # via pyasn1-modules, python-ldap, service-identity +pycparser==2.19 # via cffi pygerduty==0.37.0 -pyjwt==1.6.0 # via social-auth-core, twilio +pyhamcrest==1.9.0 # via twisted +pyjwt==1.7.1 # via social-auth-core, twilio +pyopenssl==19.0.0 # via service-identity pyparsing==2.2.0 pyrad==2.1 # via django-radius -pysocks==1.6.8 +pysocks==1.6.8 # via twilio python-dateutil==2.7.2 python-ldap==3.1.0 # via django-auth-ldap -django-cors-headers==2.4.0 python-logstash==0.4.6 python-memcached==1.59 -python3-openid>=3.0.10 # via social-auth-core python-radius==1.0 +python3-openid==3.1.0 # via social-auth-core python3-saml==1.4.0 -pytz==2018.5 # via celery, django, irc, tempora, twilio -pyyaml==3.12 # via djangorestframework-yaml -redbaron==0.6.3 +pytz==2018.9 # via celery, django, irc, tempora, twilio +pyyaml==3.13 # via djangorestframework-yaml requests-futures==0.9.7 -requests-oauthlib==0.8.0 # via social-auth-core +requests-oauthlib==1.2.0 # via social-auth-core requests[security]==2.15.1 -rply==0.7.5 # via baron service-identity==17.0.0 -simplejson==3.13.2 # via uwsgitop -six==1.11.0 # via asgi-amqp, asgiref, autobahn, automat, cryptography, django-extensions, irc, isodate, jaraco.classes, jaraco.collections, jaraco.itertools, jaraco.logging, jaraco.stream, more-itertools, pygerduty, pyrad, python-dateutil, python-memcached, slackclient, social-auth-app-django, social-auth-core, tacacs-plus, tempora, twilio, txaio, websocket-client +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 slackclient==1.1.2 social-auth-app-django==2.1.0 social-auth-core==3.0.0 tacacs_plus==1.0 -tempora==1.10 # via irc, jaraco.logging +tempora==1.14 # via irc, jaraco.logging twilio==6.10.4 -twisted==17.9.0 # via daphne -txaio==2.9.0 # via autobahn -typing==3.6.4 # via django-extensions +twisted==18.9.0 # via daphne +txaio==18.8.1 # via autobahn +typing==3.6.6 # via django-extensions uwsgi==2.0.17 uwsgitop==0.10.0 +vine==1.2.0 # via amqp websocket-client==0.47.0 # via slackclient -zope.interface==4.4.3 # via twisted +xmlsec==1.3.3 # via python3-saml +zope.interface==4.6.0 # via twisted # The following packages are considered to be unsafe in a requirements file: -pip==9.0.1 -setuptools==36.0.1 +# pip +# setuptools diff --git a/requirements/requirements_tower_uninstall.txt b/requirements/requirements_tower_uninstall.txt index e69de29bb2d1..dc3292cd0b0e 100644 --- a/requirements/requirements_tower_uninstall.txt +++ b/requirements/requirements_tower_uninstall.txt @@ -0,0 +1 @@ +enum34