summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorYanis Guenane <yanis@guenane.org>2019-06-21 11:52:22 +0200
committerYanis Guenane <yanis@guenane.org>2019-06-21 11:52:22 +0200
commit78912d20f7505c80a3b8a8699e756210aac32e3a (patch)
tree59b82c4050c01565d1ee44088d04a03cc0678245 /Makefile
parentMerge pull request #4112 from jbradberry/fix-3603 (diff)
downloadawx-78912d20f7505c80a3b8a8699e756210aac32e3a.tar.xz
awx-78912d20f7505c80a3b8a8699e756210aac32e3a.zip
Revert "Makefile: align pip and setuptools bump"
This reverts commit ec92abf014c51acc50dd4155d67a97623361f99b.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 5f3b00e9f1..a6b3c3cec6 100644
--- a/Makefile
+++ b/Makefile
@@ -124,8 +124,8 @@ virtualenv_ansible:
if [ ! -d "$(VENV_BASE)/ansible" ]; then \
virtualenv -p python --system-site-packages $(VENV_BASE)/ansible && \
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed six packaging appdirs && \
- $(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed setuptools==41.0.1 && \
- $(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed pip==19.1.1; \
+ $(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed setuptools==36.0.1 && \
+ $(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed pip==9.0.1; \
fi; \
fi