From 795d3255be88a6a1cd9d8e84281165976224309c Mon Sep 17 00:00:00 2001
From: Georgiy Eterevskiy <goshik_e@mail.ru>
Date: Thu, 15 Apr 2021 13:11:02 +0300
Subject: [PATCH] Fix command `install`
---
Makefile | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 66ee761..c66baeb 100644
--- a/Makefile
+++ b/Makefile
@@ -41,13 +41,16 @@ clean-proto:
find . -name '*_pb2.py' -exec rm -f {} +
find . -name '*_pb2_grpc.py' -exec rm -f {} +
-install-requirements:
+install-build-requirements:
pip install -r build-requirements.txt
-lint: install-requirements
+install-requirements:
+ pip install -r requirements.txt
+
+lint: install-build-requirements
flake8 perxis/
-generate: clean-proto install-requirements
+generate: clean-proto install-build-requirements
cp -avR $(SRC_PROTO_FILES_DIR) $(COPIES_PROTO_FILES_DIR)
mv $(COPIES_PROTO_FILES_DIR)/collections $(COPIES_PROTO_FILES_DIR)/collections_perxis
find $(COPIES_PROTO_FILES_DIR) -name '*.proto' -exec python3 -m grpc_tools.protoc -I${COPIES_PROTO_FILES_DIR} --python_out=$(OUTPUT_FILES_DIR) --grpc_python_out=$(OUTPUT_FILES_DIR) {} +
@@ -63,5 +66,5 @@ release: clean generate
devpi login root --password $(PYPI_PASSWORD)
devpi upload --no-vcs
-install: clean generate
+install: clean generate install-requirements
python setup.py install
--
GitLab