Merge pull request #7032 from ryanpetrello/egg-info-bye-bye

stop pre-generating awx.egg-info for the development environment

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

Makefile

@@ -353,8 +353,7 @@ swagger: reports
 check: flake8 pep8 # pyflakes pylint
 
 awx-link:
-	cp -R /tmp/awx.egg-info /awx_devel/ || true
+	python3 /awx_devel/setup.py egg_info
-	sed -i "s/placeholder/$(shell cat VERSION)/" /awx_devel/awx.egg-info/PKG-INFO
 	cp -f /tmp/awx.egg-link /venv/awx/lib/python$(PYTHON_VERSION)/site-packages/awx.egg-link
 
 TEST_DIRS ?= awx/main/tests/unit awx/main/tests/functional awx/conf/tests awx/sso/tests

installer/roles/image_build/templates/Dockerfile.j2

@@ -173,7 +173,6 @@ ADD {% if build_dev|bool %}installer/roles/image_build/files/{% endif %}rsyslog.
 ADD tools/docker-compose/launch_awx.sh /usr/bin/launch_awx.sh
 ADD tools/docker-compose/awx-manage /usr/local/bin/awx-manage
 ADD tools/docker-compose/awx.egg-link /tmp/awx.egg-link
-ADD tools/docker-compose/awx.egg-info /tmp/awx.egg-info
 ADD tools/docker-compose/nginx.conf /etc/nginx/nginx.conf
 ADD tools/docker-compose/nginx.vh.default.conf /etc/nginx/conf.d/nginx.vh.default.conf
 ADD tools/docker-compose/start_tests.sh /start_tests.sh

tools/docker-compose/awx.egg-info/PKG-INFO

@@ -1,23 +0,0 @@
-Metadata-Version: 1.1
-Name: awx
-Version: placeholder
-Summary: awx: API, UI and Task Engine for Ansible
-Home-page: http://github.com/ansible/awx
-Author: Ansible, Inc.
-Author-email: info@ansible.com
-License: Proprietary
-Description: AWX provides a web-based user interface, REST API and task engine built on top of Ansible
-Keywords: ansible
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Web Environment
-Classifier: Framework :: Django
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: Information Technology
-Classifier: Intended Audience :: System AdministratorsLicense :: Other/Proprietary License
-Classifier: Natural Language :: English
-Classifier: Operating System :: OS Independent
-Classifier: Operating System :: POSIX
-Classifier: Programming Language :: Python
-Classifier: Topic :: System :: Installation/Setup
-Classifier: Topic :: System :: Systems Administration

tools/docker-compose/awx.egg-info/dependency_links.txt

@@ -1 +0,0 @@
-

tools/docker-compose/awx.egg-info/entry_points.txt

@@ -1,10 +0,0 @@
-[console_scripts]
-tower-manage = awx:manage
-awx-manage = awx:manage
-
-[awx.credential_plugins]
-conjur = awx.main.credential_plugins.conjur:conjur_plugin
-hashivault_kv = awx.main.credential_plugins.hashivault:hashivault_kv_plugin
-hashivault_ssh = awx.main.credential_plugins.hashivault:hashivault_ssh_plugin
-azure_kv = awx.main.credential_plugins.azure_kv:azure_keyvault_plugin
-aim = awx.main.credential_plugins.aim:aim_plugin

tools/docker-compose/awx.egg-info/not-zip-safe

@@ -1 +0,0 @@
-

tools/docker-compose/awx.egg-info/top_level.txt

@@ -1 +0,0 @@
-awx

tools/docker-compose/start_tests.sh

@@ -3,9 +3,7 @@ set +x
 
 cd /awx_devel
 make clean
-cp -R /tmp/awx.egg-info /awx_devel/ || true
+make awx-link
-sed -i "s/placeholder/$(cat /awx_devel/VERSION)/" /awx_devel/awx.egg-info/PKG-INFO
-cp /tmp/awx.egg-link /venv/awx/lib/python3.6/site-packages/awx.egg-link
 
 cp awx/settings/local_settings.py.docker_compose awx/settings/local_settings.py
 make "${1:-test}"