diff options
author | Toshio Kuratomi <a.badger@gmail.com> | 2019-02-05 10:18:00 -0800 |
---|---|---|
committer | Toshio Kuratomi <a.badger@gmail.com> | 2019-02-06 13:59:55 -0800 |
commit | dfd8b659c0fbf9032e2ca24c0e36bd8755d27614 (patch) | |
tree | 738152cb2644312c44c4ebacec848460340a05ae /lib | |
parent | 2c0897caf2b2fe6eecc2361f4fd5446ba1991105 (diff) | |
download | ansible-dfd8b659c0fbf9032e2ca24c0e36bd8755d27614.tar.gz |
Have update-bundled check for updates to all bundled code
Add a test for whether we have bundled code inside of ansible that needs to be updated
Diffstat (limited to 'lib')
-rw-r--r-- | lib/ansible/compat/selectors/__init__.py | 3 | ||||
-rw-r--r-- | lib/ansible/module_utils/compat/ipaddress.py | 5 | ||||
-rw-r--r-- | lib/ansible/module_utils/six/__init__.py | 4 | ||||
-rw-r--r-- | lib/ansible/module_utils/urls.py | 4 |
4 files changed, 15 insertions, 1 deletions
diff --git a/lib/ansible/compat/selectors/__init__.py b/lib/ansible/compat/selectors/__init__.py index 8d45ea5fbf..2f73c02280 100644 --- a/lib/ansible/compat/selectors/__init__.py +++ b/lib/ansible/compat/selectors/__init__.py @@ -24,7 +24,8 @@ Compat selectors library. Python-3.5 has this builtin. The selectors2 package exists on pypi to backport the functionality as far as python-2.6. ''' # The following makes it easier for us to script updates of the bundled code -_BUNDLED_METADATA = {"pypi_name": "selectors2", "version": "1.1.0"} +_BUNDLED_METADATA = {"pypi_name": "selectors2", "version": "1.1.0", "version_constraints": ">1.0,<2.0"} + # Added these bugfix commits from 2.1.0: # * https://github.com/SethMichaelLarson/selectors2/commit/3bd74f2033363b606e1e849528ccaa76f5067590 # Wrap kqueue.control so that timeout is a keyword arg diff --git a/lib/ansible/module_utils/compat/ipaddress.py b/lib/ansible/module_utils/compat/ipaddress.py index db4f5ac62f..c46ad72a09 100644 --- a/lib/ansible/module_utils/compat/ipaddress.py +++ b/lib/ansible/module_utils/compat/ipaddress.py @@ -66,6 +66,11 @@ from __future__ import unicode_literals import itertools import struct + +# The following makes it easier for us to script updates of the bundled code and is not part of +# upstream +_BUNDLED_METADATA = {"pypi_name": "ipaddress", "version": "1.0.22"} + __version__ = '1.0.22' # Compatibility functions diff --git a/lib/ansible/module_utils/six/__init__.py b/lib/ansible/module_utils/six/__init__.py index 4bc670a645..0f122c3d47 100644 --- a/lib/ansible/module_utils/six/__init__.py +++ b/lib/ansible/module_utils/six/__init__.py @@ -33,6 +33,10 @@ import operator import sys import types +# The following makes it easier for us to script updates of the bundled code. It is not part of +# upstream six +_BUNDLED_METADATA = {"pypi_name": "six", "version": "1.11.0"} + __author__ = "Benjamin Peterson <benjamin@python.org>" __version__ = "1.11.0" diff --git a/lib/ansible/module_utils/urls.py b/lib/ansible/module_utils/urls.py index 0d48eba2b1..a286fa5be1 100644 --- a/lib/ansible/module_utils/urls.py +++ b/lib/ansible/module_utils/urls.py @@ -136,6 +136,10 @@ if not HAS_SSLCONTEXT and HAS_SSL: del libssl +# The following makes it easier for us to script updates of the bundled backports.ssl_match_hostname +# The bundled backports.ssl_match_hostname should really be moved into its own file for processing +_BUNDLED_METADATA = {"pypi_name": "backports.ssl_match_hostname", "version": "3.5.0.1"} + LOADED_VERIFY_LOCATIONS = set() HAS_MATCH_HOSTNAME = True |