diff --git a/Makefile b/Makefile index 8f88ac5c50..05c4c3cff9 100644 --- a/Makefile +++ b/Makefile @@ -168,7 +168,6 @@ endif .DEFAULT_GOAL := build .PHONY: clean rebase push requirements requirements_dev requirements_jenkins \ - real-requirements real-requirements_dev real-requirements_jenkins \ develop refresh adduser migrate dbchange dbshell runserver celeryd \ receiver test test_unit test_coverage coverage_html test_jenkins dev_build \ release_build release_clean sdist rpmtar mock-rpm mock-srpm rpm-sign \ @@ -259,33 +258,34 @@ virtualenv: fi; \ fi -# Install runtime, development and jenkins requirements -requirements requirements_ansible requirements_dev requirements_jenkins: %: real-% - -real-requirements_ansible: virtualenv +requirements_ansible: if [ "$(VENV_BASE)" ]; then \ . $(VENV_BASE)/ansible/bin/activate; \ fi && \ pip install -r requirements/requirements_ansible.txt # Install third-party requirements needed for Tower's environment. -real-requirements: requirements_ansible +requirements_tower: if [ "$(VENV_BASE)" ]; then \ . $(VENV_BASE)/tower/bin/activate; \ fi && \ pip install -r requirements/requirements.txt; \ -real-requirements_dev: requirements_ansible +requirements_tower_dev: if [ "$(VENV_BASE)" ]; then \ . $(VENV_BASE)/tower/bin/activate; \ fi && \ pip install -r requirements/requirements_dev.txt # Install third-party requirements needed for running unittests in jenkins -real-requirements_jenkins: +requirements_jenkins: pip install -r requirements/requirements_jenkins.txt $(NPM_BIN) install csslint jshint +requirements: virtualenv requirements_ansible requirements_tower + +requirements_dev: virtualenv requirements_ansible requirements_tower_dev + # "Install" ansible-tower package in development mode. develop: @if [ "$(VIRTUAL_ENV)" ]; then \ diff --git a/setup.py b/setup.py index 2473113ec9..4b89789df7 100755 --- a/setup.py +++ b/setup.py @@ -17,30 +17,26 @@ if os.getenv('OFFICIAL', 'no') == 'yes': else: build_timestamp = '-' + os.getenv("BUILD", datetime.datetime.now().strftime('0.git%Y%m%d%H%M')) -# Path prefix for when we're running under a software collection -scl_prefix = os.getenv('SCL_PREFIX', '') -httpd_scl_prefix = os.getenv('HTTPD_SCL_PREFIX', scl_prefix) - # Paths we'll use later etcpath = "/etc/tower" homedir = "/var/lib/awx" bindir = "/usr/bin" -sharedir = scl_prefix + "/usr/share/awx" -docdir = scl_prefix + "/usr/share/doc/ansible-tower" +sharedir = "/usr/share/awx" +docdir = "/usr/share/doc/ansible-tower" munin_plugin_path = "/etc/munin/plugins/" munin_plugin_conf_path = "/etc/munin/plugin-conf.d" if os.path.exists("/etc/debian_version"): - sysinit = scl_prefix + "/etc/init.d" - webconfig = httpd_scl_prefix + "/etc/apache2/conf.d" + sysinit = "/etc/init.d" + webconfig = "/etc/apache2/conf.d" shutil.copy("config/awx-munin-ubuntu.conf", "config/awx-munin.conf") # sosreport-3.1 (and newer) look in '/usr/share/sosreport/sos/plugins' # sosreport-3.0 looks in '/usr/lib/python2.7/dist-packages/sos/plugins' # debian/.links will create symlinks to support both versions sosconfig = "/usr/share/sosreport/sos/plugins" else: - sysinit = scl_prefix + "/etc/rc.d/init.d" - webconfig = httpd_scl_prefix + "/etc/httpd/conf.d" + sysinit = "/etc/rc.d/init.d" + webconfig = "/etc/httpd/conf.d" shutil.copy("config/awx-munin-el.conf", "config/awx-munin.conf") # The .spec will create symlinks to support multiple versions of sosreport sosconfig = "/usr/share/sosreport/sos/plugins"