diff --git a/.gitignore b/.gitignore index 489b9281..bba70913 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ # The public folder is generated from the frontend /assets/public /assets/setup - +.gobin .vscode # test text file backend/server/tests/exec/data/test.txt diff --git a/Makefile b/Makefile index 6a6550a1..7211aa32 100644 --- a/Makefile +++ b/Makefile @@ -18,11 +18,12 @@ frontend: phony frontend/node_modules cd plugins/notifications; make builtin; make frontend cd plugins/registry; make builtin; make frontend -heedy: backend/main.go phony # gencode -ifeq ($(shell which statik),) - go get github.com/rakyll/statik -endif - statik -src=./assets -dest=./backend -p assets -f +.gobin/statik: + GOBIN=${PWD}/.gobin go install github.com/rakyll/statik + + +heedy: backend/main.go .gobin/statik phony # gencode + ./.gobin/statik -src=./assets -dest=./backend -p assets -f cd backend; $(GO) build --tags "sqlite_foreign_keys json1 sqlite_preupdate_hook" -o ../heedy -ldflags "-X \"github.com/heedy/heedy/backend/buildinfo.BuildTimestamp=`date -u '+%Y-%m-%d %H:%M:%S'`\" -X github.com/heedy/heedy/backend/buildinfo.GitHash=`git rev-parse HEAD` -X github.com/heedy/heedy/backend/buildinfo.Version=$(VERSION)" rm ./backend/assets/statik.go diff --git a/api/python/requirements.txt b/api/python/requirements.txt index b81d09a8..66d08d05 100644 --- a/api/python/requirements.txt +++ b/api/python/requirements.txt @@ -7,4 +7,5 @@ pytest-timeout numpy aiohttp -dateparser \ No newline at end of file +dateparser +requests \ No newline at end of file diff --git a/api/python/setup.py b/api/python/setup.py index 6ff72539..259cd25d 100644 --- a/api/python/setup.py +++ b/api/python/setup.py @@ -29,6 +29,7 @@ install_requires=[ "numpy", "aiohttp", - "dateparser" + "dateparser", + "requests" ], )