Merge pull request #140 from abitrolly/fix-install

Install grumpy-tools before building grumpy-runtime
grumpyhome · Dec 27, 2019 · ce4d69f · ce4d69f
2 parents 77b7bfb + 9d26049
commit ce4d69f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/grumpy-runtime-src/MANIFEST.in b/grumpy-runtime-src/MANIFEST.in
@@ -8,3 +8,5 @@ global-exclude *.egg-info/*
 global-exclude *__pycache__*
 
 recursive-exclude grumpy-tools-src *.go
+
+include pyproject.toml
diff --git a/grumpy-runtime-src/Makefile b/grumpy-runtime-src/Makefile
@@ -50,8 +50,12 @@ PY_DIR := build/lib/python2.7/site-packages
 PY_INSTALL_DIR := $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
 
 export GOPATH := $(ROOT_DIR)/build
-export PYTHONPATH := $(ROOT_DIR)/$(PY_DIR)
 export PATH := $(ROOT_DIR)/build/bin:$(PATH)
+ifndef PYTHONPATH
+  export PYTHONPATH := $(ROOT_DIR)/$(PY_DIR)
+else
+  export PYTHONPATH := $(PYTHONPATH):$(ROOT_DIR)/$(PY_DIR)
+endif
 
 GOPATH_PY_ROOT := $(GOPATH)/src/__python__
 

diff --git a/grumpy-runtime-src/pyproject.toml b/grumpy-runtime-src/pyproject.toml
@@ -0,0 +1,2 @@
+[build-system]
+requires = ["setuptools", "wheel", "grumpy-tools>0.2.2"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,3 +8,5 @@ global-exclude .egg-info/
		global-exclude __pycache__

		recursive-exclude grumpy-tools-src *.go

		include pyproject.toml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[build-system]
		requires = ["setuptools", "wheel", "grumpy-tools>0.2.2"]