diff --git a/docs/licenses/amqp-2.3.2.tar.gz b/docs/licenses/amqp-2.3.2.tar.gz
deleted file mode 100644
index 30d08e55ad78..000000000000
Binary files a/docs/licenses/amqp-2.3.2.tar.gz and /dev/null differ
diff --git a/docs/licenses/amqp-2.4.2.tar.gz b/docs/licenses/amqp-2.4.2.tar.gz
new file mode 100644
index 000000000000..78afb45311de
Binary files /dev/null and b/docs/licenses/amqp-2.4.2.tar.gz differ
diff --git a/docs/licenses/deprecation.txt b/docs/licenses/deprecation.txt
deleted file mode 100644
index 8dada3edaf50..000000000000
--- a/docs/licenses/deprecation.txt
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "{}"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright {yyyy} {name of copyright owner}
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/docs/licenses/lockfile.txt b/docs/licenses/lockfile.txt
new file mode 100644
index 000000000000..610c0793f71c
--- /dev/null
+++ b/docs/licenses/lockfile.txt
@@ -0,0 +1,21 @@
+This is the MIT license: http://www.opensource.org/licenses/mit-license.php
+
+Copyright (c) 2007 Skip Montanaro.
+
+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/ntlm-auth-1.0.6.tar.gz b/docs/licenses/ntlm-auth-1.0.6.tar.gz
deleted file mode 100644
index 388da4b75327..000000000000
Binary files a/docs/licenses/ntlm-auth-1.0.6.tar.gz and /dev/null differ
diff --git a/docs/licenses/ntlm-auth-1.3.0.tar.gz b/docs/licenses/ntlm-auth-1.3.0.tar.gz
new file mode 100644
index 000000000000..cdc5f009c4e5
Binary files /dev/null and b/docs/licenses/ntlm-auth-1.3.0.tar.gz differ
diff --git a/docs/licenses/websocket-client.txt b/docs/licenses/websocket-client.txt
index 82b377b1e7a0..d5646e333e4a 100644
--- a/docs/licenses/websocket-client.txt
+++ b/docs/licenses/websocket-client.txt
@@ -1,166 +1,11 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
+Copyright 2018 Hiroki Ohtani.
- 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.
+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.
- 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.
+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.
- 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.
+3. Neither the name of the copyright holder 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 HOLDER 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.
\ No newline at end of file
diff --git a/docs/licenses/websocket_client-0.47.0.tar.gz b/docs/licenses/websocket_client-0.47.0.tar.gz
deleted file mode 100644
index 856bc3109f02..000000000000
Binary files a/docs/licenses/websocket_client-0.47.0.tar.gz and /dev/null differ
diff --git a/requirements/README.md b/requirements/README.md
index 0d3c241b3011..3aeede1db21e 100644
--- a/requirements/README.md
+++ b/requirements/README.md
@@ -1,23 +1,48 @@
-The requirements.txt and requirements_ansible.txt files are generated from requirements.in and requirements_ansible.in, respectively, using `pip-tools` `pip-compile`. The following commands should do this if ran inside the tower_tools container.
+The requirements.txt and requirements_ansible.txt files are generated from requirements.in and requirements_ansible.in, respectively, using `pip-tools` `pip-compile`. The following commands should do this if ran inside the tools_awx container.
-NOTE: before running `pip-compile`, please copy-paste contents in `requirements/requirements_git.txt` to the top of `requirements/requirements.in` and prepend each copied line with `-e `. Later after `requirements.txt` is generated, don't forget to remove all `git+https://github.com...`-like lines from both `requirements.txt` and `requirements.in` (repeat for `requirements_ansible_git.txt` and `requirements_ansible.in`)
-
-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. This will produce python 3 requirements files.
```
-python3 -m venvpip install pip-tools /buildit
+python3 -m venv /buildit
source /buildit/bin/activate
pip install pip-tools
pip install pip --upgrade
-pip-compile requirements/requirements.in > requirements/requirements.txt
-pip-compile requirements/requirements_ansible.in > requirements/requirements_ansible.txt
+pip-compile -U -r --allow-unsafe --output-file requirements/requirements.txt requirements/requirements.in
+pip-compile -U -r --allow-unsafe --output-file requirements/requirements_ansible_py3.txt requirements/requirements_ansible.in
+```
+
+Remove the `docutils` line from `requirements/requirements.txt`.
+
+The Ansible venv requirements file needs to start with the python 2 version
+as a base. Then we can run the tool again to get the python 3 version.
+Consult the output of the `diff` command and add a conditional switch in those cases.
+
+```
+virtualenv -p python2 /buildit_py2
+source /buildit_py2/bin/activate
+pip install pip-tools
+pip install pip --upgrade
+
+pip-compile -U -r --allow-unsafe --output-file requirements/requirements_ansible.txt requirements/requirements_ansible.in
+diff requirements/requirements_ansible_py3.txt requirements/requirements_ansible.txt
+rm requirements/requirements_ansible_py3.txt
```
-## Known Issues
+Python 3 exceptions should be added to relevant `requirements_ansible.txt` lines
+after version numbers with the syntax of `; python_version < '3'`.
+
+## Licenses and Source Files
+
+If any library has a change to its license with the upgrade, then the license for that library
+inside of `docs/licenses` needs to be updated.
-* 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.
+For libraries that have source distribution requirements (LGPL as an example),
+a tarball of the library is kept along with the license.
+To download the PyPI tarball, you can run this command:
+
+```
+pip download -d docs/licenses/ --no-binary :all: --no-deps
+```
-* 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.
+Make sure to delete the old tarball if it is an upgrade.
diff --git a/requirements/requirements.in b/requirements/requirements.in
index 0667c8dcc21f..747d18b07983 100644
--- a/requirements/requirements.in
+++ b/requirements/requirements.in
@@ -5,8 +5,9 @@ asgiref==1.1.2
azure-keyvault==1.1.0
boto==2.47.0
channels==1.1.8
-celery==4.2.1
+celery==4.3.0
daphne==1.3.0 # Last before backwards-incompatible channels 2 upgrade
+twisted[tls]>=17.1 # from daphne, see https://github.com/django/daphne/pull/257
defusedxml==0.5.0 # py36 support https://github.com/tiran/defusedxml/pull/4
Django==1.11.20
django-auth-ldap==1.7.0
@@ -34,7 +35,6 @@ psutil==5.4.3
psycopg2==2.7.3.2 # problems with Segmentation faults / wheels on upgrade
pygerduty==0.37.0
pyparsing==2.2.0
-python-daemon==2.2.0
python-dateutil==2.7.2 # contains support for TZINFO= parsing
python-memcached==1.59
python-radius==1.0
@@ -43,7 +43,6 @@ social-auth-core==3.0.0
social-auth-app-django==2.1.0
requests==2.21.0
requests-futures==0.9.7
-service-identity==17.0.0
slackclient==1.1.2
tacacs_plus==1.0
twilio==6.10.4
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index cf2bb212a12e..81571fb5f97e 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -2,31 +2,31 @@
# This file is autogenerated by pip-compile
# To update, run:
#
-# pip-compile requirements/requirements.in
+# pip-compile --allow-unsafe --output-file=requirements/requirements.txt 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.4
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-common==1.1.20 # via azure-keyvault
azure-keyvault==1.1.0
azure-nspkg==3.0.2 # via azure-keyvault
-billiard==3.5.0.5 # via celery
+billiard==3.6.0.0 # via celery
boto==2.47.0
-celery==4.2.1
-certifi==2018.11.29 # via msrest, requests
-cffi==1.12.1 # via cryptography
+celery==4.3.0
+certifi==2019.3.9 # via msrest, requests
+cffi==1.12.3 # via cryptography
channels==1.1.8
chardet==3.0.4 # via requests
constantly==15.1.0 # via twisted
-cryptography==2.6.1 # via adal, azure-keyvault, pyopenssl
+cryptography==2.6.1 # via adal, azure-keyvault, pyopenssl, service-identity
daphne==1.3.0
defusedxml==0.5.0
django-auth-ldap==1.7.0
@@ -45,78 +45,79 @@ django==1.11.20
djangorestframework-yaml==1.0.3
djangorestframework==3.7.7
future==0.16.0 # via django-radius
-hyperlink==18.0.0 # via twisted
-idna==2.8 # via hyperlink, requests
+hyperlink==19.0.0 # via twisted
+idna==2.8 # via hyperlink, requests, twisted
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.1
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
ptyprocess==0.6.0 # via pexpect
-pyasn1-modules==0.2.4 # via python-ldap, service-identity
+pyasn1-modules==0.2.5 # 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
pyhamcrest==1.9.0 # via twisted
pyjwt==1.7.1 # via adal, social-auth-core, twilio
-pyopenssl==19.0.0 # via service-identity
+pyopenssl==19.0.0 # via twisted
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.3 # via ansible-runner
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==5.1 # 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
-service-identity==17.0.0
+requests==2.21.0
+service-identity==18.1.0 # via twisted
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
+tempora==1.14.1 # via irc, jaraco.logging
twilio==6.10.4
-twisted==18.9.0 # via daphne
+twisted[tls]==19.2.0
txaio==18.8.1 # via autobahn
typing==3.6.6 # via django-extensions
urllib3==1.24.3 # 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, celery
+websocket-client==0.56.0 # via slackclient
xmlsec==1.3.3 # via python3-saml
zope.interface==4.6.0 # via twisted
diff --git a/requirements/requirements_ansible.in b/requirements/requirements_ansible.in
index df9b482fe9de..d3fbd871dde8 100644
--- a/requirements/requirements_ansible.in
+++ b/requirements/requirements_ansible.in
@@ -46,6 +46,7 @@ ncclient==0.6.3
netaddr
# oVirt/RHV
ovirt-engine-sdk-python==4.2.4 # minimum set inside Ansible facts module requirements
+pycurl==7.43.0.1 # higher versions will not install without SSL backend specified
# AWX usage
pexpect==4.6.0 # same as AWX requirement
psutil==5.4.3 # same as AWX requirement
diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt
index c9e97d4b2c73..c6f8b313a14a 100644
--- a/requirements/requirements_ansible.txt
+++ b/requirements/requirements_ansible.txt
@@ -2,12 +2,12 @@
# This file is autogenerated by pip-compile
# To update, run:
#
-# pip-compile --output-file requirements/requirements_ansible.txt requirements/requirements_ansible.in
+# pip-compile -U -r --allow-unsafe --output-file requirements/requirements_ansible.txt requirements/requirements_ansible.in
#
adal==1.2.1 # via msrestazure
appdirs==1.4.3 # via openstacksdk
-applicationinsights==0.11.1 # via azure-cli-core
-argcomplete==1.9.4 # via azure-cli-core, knack
+applicationinsights==0.11.9 # 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
@@ -42,82 +42,83 @@ azure-mgmt-web==0.41.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.3 # via bcrypt, cryptography, pynacl
chardet==3.0.4 # via requests
-colorama==0.3.9 # via azure-cli-core, knack
-cryptography==2.6.1 # 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
+cryptography==2.6.1 # via adal, azure-keyvault, azure-storage, openstacksdk, paramiko, pyopenssl, requests-kerberos, requests-ntlm
+decorator==4.4.0 # via dogpile.cache, openstacksdk
docutils==0.14 # via botocore
-dogpile.cache==0.6.5 # via openstacksdk
+dogpile.cache==0.7.1 # via openstacksdk
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; python_version < '3' # via cryptography, openstacksdk
iso8601==0.1.12 # via keystoneauth1, openstacksdk
isodate==0.6.0 # via msrest
jinja2==2.10.1
-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
-keystoneauth1==3.11.2 # via openstacksdk, os-client-config
+keystoneauth1==3.14.0 # 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; python_version < '3' # via humanfriendly
msrest==0.6.1
msrestazure==0.5.0
-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
+packaging==19.0
paramiko==2.4.2 # via azure-cli-core, ncclient
-pbr==3.1.1 # via keystoneauth1, openstacksdk, os-service-types, stevedore
+pbr==5.2.0 # 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.5 # via google-auth
+pyasn1==0.4.5 # via paramiko, pyasn1-modules, rsa
+pycparser==2.19 # via cffi
+pycurl==7.43.0.1
+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
python-dateutil==2.6.1 # via adal, azure-storage, botocore
pyvmomi==6.5
pywinrm[kerberos]==0.3.0
-pyyaml==5.1 # via azure-cli-core, knack, openstacksdk, os-client-config
+pyyaml==5.1 # via azure-cli-core, knack, openstacksdk
requests-credssp==1.0.2
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
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
+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
+typing==3.6.6; python_version < '3' # via msrest
urllib3==1.24.3 # 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