From b533a9eb7b5561af07eaa0dbb0c20110e37ccbc0 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Wed, 14 Dec 2016 10:30:28 -0500 Subject: [PATCH] purge make requirements_jenkins --- Makefile | 11 +---------- requirements/requirements_jenkins.txt | 13 ------------- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 requirements/requirements_jenkins.txt diff --git a/Makefile b/Makefile index 684b267244..89263181bc 100644 --- a/Makefile +++ b/Makefile @@ -175,7 +175,6 @@ UI_RELEASE_FLAG_FILE = awx/ui/.release_built .DEFAULT_GOAL := build .PHONY: clean clean-tmp clean-venv rebase push requirements requirements_dev \ - 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 \ @@ -309,19 +308,11 @@ requirements_tower_dev: $(VENV_BASE)/tower/bin/pip uninstall --yes -r requirements/requirements_dev_uninstall.txt; \ fi -# Install third-party requirements needed for running unittests in jenkins -requirements_jenkins: - if [ "$(VENV_BASE)" ]; then \ - . $(VENV_BASE)/tower/bin/activate && pip install -Ir requirements/requirements_jenkins.txt; \ - else \ - pip install -Ir requirements/requirements_jenkins.txt; \ - fi - requirements: requirements_ansible requirements_tower requirements_dev: requirements requirements_tower_dev -requirements_test: requirements requirements_jenkins +requirements_test: requirements # "Install" ansible-tower package in development mode. develop: diff --git a/requirements/requirements_jenkins.txt b/requirements/requirements_jenkins.txt deleted file mode 100644 index 1546b0ae3b..0000000000 --- a/requirements/requirements_jenkins.txt +++ /dev/null @@ -1,13 +0,0 @@ -ansible==1.9.4 -coverage -pyflakes -pep8 -pylint -flake8 -distribute==0.7.3 -unittest2 -pytest==2.9.2 -pytest-cov -pytest-django -pytest-pythonpath -pytest-mock