Skip to content

Commit 3ba0975

Browse files
committed
Temporary patch to try different options to install venv in travis
1 parent 61624dc commit 3ba0975

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

Makefile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -376,10 +376,7 @@ flake8: requirements .flake8
376376
@echo
377377
@echo "==================== st2client install check ===================="
378378
@echo
379-
test -f $(VIRTUALENV_ST2CLIENT_DIR)/bin/activate || $(PYTHON_VERSION) -m venv $(VIRTUALENV_ST2CLIENT_DIR) || virtualenv --python=$(PYTHON_VERSION) $(VIRTUALENV_ST2CLIENT_DIR) --no-download
380-
381-
test -f $(VIRTUALENV_ST2CLIENT_DIR)/bin/activate
382-
ls -l $(VIRTUALENV_ST2CLIENT_DIR)
379+
test -f $(VIRTUALENV_ST2CLIENT_DIR)/bin/activate || virtualenv --python=$(PYTHON_VERSION) $(VIRTUALENV_ST2CLIENT_DIR) --no-download --system-site-packages
383380

384381
# Setup PYTHONPATH in bash activate script...
385382
# Delete existing entries (if any)
@@ -396,15 +393,18 @@ flake8: requirements .flake8
396393
# NOTE We need to upgrade setuptools to avoid bug with dependency resolving in old versions
397394
# Setuptools 42 added support for python_requires, which is used by the configparser package,
398395
# which is required by the importlib-metadata package
399-
if [[ $(PYTHON_VERSION) == *"python2.7"* ]]; then \
400-
echo 'Upgrading pip==$(PIP_VERSION) in python2.7 virtualenv'; \
401-
$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "pip==$(PIP_VERSION)"; \
402-
$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "setuptools==44.1.0"; \
403-
else \
404-
echo 'Upgrading pip==$(PIP_VERSION) in python3.x virtualenv'; \
405-
$(VIRTUALENV_ST2CLIENT_DIR)/bin/python -m pip install --upgrade "pip==$(PIP_VERSION)"; \
406-
$(VIRTUALENV_ST2CLIENT_DIR)/bin/python -m pip install --upgrade "setuptools==44.1.0"; \
407-
fi
396+
$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "pip==$(PIP_VERSION)"
397+
$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "setuptools==44.1.0"
398+
399+
#if [[ $(PYTHON_VERSION) == *"python2.7"* ]]; then \
400+
# echo 'Upgrading pip==$(PIP_VERSION) in python2.7 virtualenv'; \
401+
# $(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "pip==$(PIP_VERSION)"; \
402+
# $(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "setuptools==44.1.0"; \
403+
#else \
404+
# echo 'Upgrading pip==$(PIP_VERSION) in python3.x virtualenv'; \
405+
# $(VIRTUALENV_ST2CLIENT_DIR)/bin/python -m pip install --upgrade "pip==$(PIP_VERSION)"; \
406+
# $(VIRTUALENV_ST2CLIENT_DIR)/bin/python -m pip install --upgrade "setuptools==44.1.0"; \
407+
#fi
408408

409409
$(VIRTUALENV_ST2CLIENT_DIR)/bin/activate; cd st2client ; ../$(VIRTUALENV_ST2CLIENT_DIR)/bin/python setup.py install ; cd ..
410410
$(VIRTUALENV_ST2CLIENT_DIR)/bin/st2 --version

0 commit comments

Comments
 (0)