From f7aed1c1e31749d12ee950c21c512d5c3e99978e Mon Sep 17 00:00:00 2001 From: Peter Parente Date: Wed, 14 Oct 2015 10:38:36 -0400 Subject: [PATCH] Don't use Docker on travis * Issues with capabilities and network (c) Copyright IBM Corp. 2015 --- .travis.yml | 16 ++++++---------- Makefile | 5 +++-- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index c01b8b0..cd23bf6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,10 @@ -sudo: required - language: python - python: + - 2.7 + - 3.3 - 3.4 - -services: - - docker - + - 3.5 script: - - make test - - make sdist - - make install + - python setup.py sdist + - pip install --no-use-wheel dist/*.tar.gz + - python -B -m unittest discover diff --git a/Makefile b/Makefile index f4fe035..2e9ffc6 100644 --- a/Makefile +++ b/Makefile @@ -3,13 +3,14 @@ .PHONY: bash clean dev help sdist test - IMAGE:=jupyter/minimal-notebook:4.0 + +DOCKER_ARGS?= define DOCKER docker run -it --rm \ --workdir '/srv/kernel_gateway' \ -e PYTHONPATH='/srv/kernel_gateway' \ - -v `pwd`:/srv/kernel_gateway + -v `pwd`:/srv/kernel_gateway $(DOCKER_ARGS) endef help: