From e0711d702444368ea608a72e5eba40d08c16e184 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Mon, 5 Jan 2015 05:30:24 +1100 Subject: [PATCH] * Upd fabfile --- fabfile.py | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/fabfile.py b/fabfile.py index f3a8a8712..8b1c72770 100644 --- a/fabfile.py +++ b/fabfile.py @@ -1,8 +1,7 @@ from fabric.api import local, run, lcd, cd, env from os.path import exists as file_exists -from fabtools.python import install, is_installed, virtualenv, install_requirements +from fabtools.python import virtualenv from os import path -import json PWD = path.dirname(__file__) @@ -10,20 +9,16 @@ VENV_DIR = path.join(PWD, '.env') DEV_ENV_DIR = path.join(PWD, '.denv') -def require_dep(name): - local('pip install %s' % name) - - def dev(): # Allow this to persist, since we aren't as rigorous about keeping state clean if not file_exists('.denv'): local('virtualenv .denv') with virtualenv(DEV_ENV_DIR): - require_dep('cython') - require_dep('murmurhash') - require_dep('numpy') - local('pip install -r requirements.txt') + local('pip install cython') + local('pip install murmurhash') + local('pip install -r dev_requirements.txt') + def sdist(): @@ -44,12 +39,11 @@ def setup(): if file_exists('.env'): local('rm -rf .env') local('virtualenv .env') - with virtualenv(VENV_DIR): - local('pip install --upgrade setuptools') def install(): with virtualenv(VENV_DIR): + local('pip install --upgrade setuptools') local('pip install dist/*.tar.gz') local('pip install pytest') @@ -57,14 +51,7 @@ def install(): def make(): with virtualenv(DEV_ENV_DIR): with lcd(path.dirname(__file__)): - local('python dev_setup.py build_ext --inplace > /dev/null') - - -def vmake(): - with virtualenv(VENV_DIR): - with lcd(path.dirname(__file__)): - local('python dev_setup.py build_ext --inplace') - + local('python setup.py build_ext --inplace') def clean(): @@ -78,13 +65,8 @@ def test(): local('py.test -x') -def clean(): - local('python setup.py clean --all') - - -def docs(): - with lcd('docs'): - local('make html') +def travis(): + local('open https://travis-ci.org/honnibal/thinc') def pos():