Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: stop bundling virtualenv and assorted fixes #469

Merged
merged 3 commits into from
Jul 24, 2017
Merged

chore: stop bundling virtualenv and assorted fixes #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eaf91f0
Use the right python executable.
hannosch Jul 24, 2017
4ebeb15
Remove deprecated `pip --download-cache` option.
hannosch Jul 24, 2017
698873a
Remove unused GEVENT_VERSION env variable.
hannosch Jul 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ site-packages/
zookeeper/
.coverage
.idea
.pip_cache
.project
.pydevproject
.tox
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ addons:
packages:
- libevent-dev
cache:
pip: true
directories:
- "$HOME/.cache/pip"
- zookeeper
language: python
python:
Expand Down
10 changes: 2 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
HERE = $(shell pwd)
BIN = $(HERE)/bin
PYTHON = $(BIN)/python
PIP_DOWNLOAD_CACHE ?= $(HERE)/.pip_cache
INSTALL = $(BIN)/pip install
ifneq ($(TRAVIS), true)
INSTALL += --download-cache $(PIP_DOWNLOAD_CACHE)
endif
TOX_VENV ?= py27
BUILD_DIRS = bin build include lib lib64 man share

GEVENT_VERSION ?= 1.0.1
PYTHON_EXE = $(shell [ -f $(PYTHON) ] && echo $(PYTHON) || echo python)
PYPY = $(shell $(PYTHON_EXE) -c "import sys; print(getattr(sys, 'pypy_version_info', False) and 'yes' or 'no')")
TRAVIS ?= false
Expand All @@ -18,9 +13,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 .
VENV_CMD = $(PYTHON_EXE) -m venv .
else
VENV_CMD = python -m virtualenv .
VENV_CMD = $(PYTHON_EXE) -m virtualenv .
endif
ifeq ($(PYPY),yes)
GREENLET_SUPPORTED = no
Expand All @@ -37,7 +32,6 @@ build: $(PYTHON)
ifeq ($(GREENLET_SUPPORTED),yes)
$(INSTALL) -U -r requirements_eventlet.txt
$(INSTALL) -U -r requirements_gevent.txt
$(INSTALL) -f https://github.com/surfly/gevent/releases gevent==$(GEVENT_VERSION)
endif
ifneq ($(TRAVIS), true)
$(INSTALL) -U -r requirements_sphinx.txt
Expand Down
9 changes: 0 additions & 9 deletions kazoo/tests/test_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,6 @@ def setUp(self):
if not os.environ.get('TRAVIS'):
raise SkipTest('Only run build config tests on Travis.')

def test_gevent_version(self):
try:
import gevent
except ImportError:
raise SkipTest('gevent not available.')
env_version = os.environ.get('GEVENT_VERSION')
if env_version:
self.assertEqual(env_version, gevent.__version__)

def test_zookeeper_version(self):
server_version = self.client.server_version()
server_version = '.'.join([str(i) for i in server_version])
Expand Down