Merge branch 'develop' into test-travis-fix

This commit is contained in:
Javier Goizueta
2017-11-03 15:12:29 +01:00
6 changed files with 13 additions and 9 deletions

View File

@@ -2,11 +2,11 @@ include ../../Makefile.global
# Install the package locally for development
install:
pip install --upgrade ./crankshaft
$(PIP) install --upgrade ./crankshaft
# Test develpment install
test:
nosetests crankshaft/test/
$(NOSETESTS) crankshaft/test/
release: ../../release/$(EXTENSION).control $(SOURCES_DATA)
mkdir -p ../../release/python/$(EXTVERSION)
@@ -14,4 +14,4 @@ release: ../../release/$(EXTENSION).control $(SOURCES_DATA)
$(SED) -i -r 's/version='"'"'[0-9]+\.[0-9]+\.[0-9]+'"'"'/version='"'"'$(EXTVERSION)'"'"'/g' ../../release/python/$(EXTVERSION)/$(PACKAGE)/setup.py
deploy:
pip install $(RUN_OPTIONS) --upgrade ../../release/python/$(RELEASE_VERSION)/$(PACKAGE)
$(PIP) install $(RUN_OPTIONS) --upgrade ../../release/python/$(RELEASE_VERSION)/$(PACKAGE)