Address additional ansible_core rename issues (#72906)

* Update __requires__ to reference the correct ansible_core package name

* ansible-test updates to handle the correct egg_info for ansible_core
This commit is contained in:
Matt Martz 2020-12-08 12:22:55 -06:00 committed by GitHub
parent 57c2cc7c77
commit 6bc1e9f5dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions

View file

@ -22,7 +22,7 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
__requires__ = ['ansible_base']
__requires__ = ['ansible_core']
import errno

View file

@ -4,7 +4,7 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
__requires__ = ['ansible_base']
__requires__ = ['ansible_core']
import fcntl

View file

@ -392,12 +392,12 @@ def generate_egg_info(args):
# inclusion of the version number in the path is optional
# see: https://setuptools.readthedocs.io/en/latest/formats.html#filename-embedded-metadata
egg_info_path = ANSIBLE_LIB_ROOT + '_base-%s.egg-info' % ansible_version
egg_info_path = ANSIBLE_LIB_ROOT + '_core-%s.egg-info' % ansible_version
if os.path.exists(egg_info_path):
return
egg_info_path = ANSIBLE_LIB_ROOT + '_base.egg-info'
egg_info_path = ANSIBLE_LIB_ROOT + '_core.egg-info'
if os.path.exists(egg_info_path):
return

View file

@ -38,6 +38,7 @@ class UnversionedSource(SourceProvider):
'__pycache__',
'ansible.egg-info',
'ansible_base.egg-info',
'ansible_core.egg-info',
)
kill_sub_dir = {