Skip to content

Commit

Permalink
chore: stop bundling virtualenv
Browse files Browse the repository at this point in the history
We bundled our own virtualenv copy to work around bugs in travis-ci
(0cdb381). That's a 5+ year old bug
which isn't around anymore.

So no need to keep bundling virtualenv.

closes #462
  • Loading branch information
jeffwidman authored and hannosch committed Jul 24, 2017
1 parent 622604b commit af9b4ca
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 2,345 deletions.
1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ exclude .travis.yml
exclude Makefile
exclude run_failure.py
recursive-include kazoo *
recursive-exclude sw *
recursive-include docs *
global-exclude *pyc *pyo
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ TRAVIS_PYTHON_VERSION ?= $(shell $(PYTHON_EXE) -c "import sys; print('.'.join([s
GREENLET_SUPPORTED = yes
ifeq ($(findstring 3.,$(TRAVIS_PYTHON_VERSION)), 3.)
GREENLET_SUPPORTED = no
VENV_CMD = python -m venv .
else
VENV_CMD = python -m virtualenv .
endif
ifeq ($(PYPY),yes)
GREENLET_SUPPORTED = no
Expand All @@ -28,7 +31,7 @@ endif
all: build

$(PYTHON):
python sw/virtualenv.py .
$(VENV_CMD)

build: $(PYTHON)
ifeq ($(GREENLET_SUPPORTED),yes)
Expand Down
Loading

0 comments on commit af9b4ca

Please sign in to comment.