Skip to content

Add Format and Lint to Makefile (#545) #610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
khorshuheng merged 2 commits into from
Apr 14, 2020
Merged

Add Format and Lint to Makefile (#545) #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03b96f4
Add Format and Lint to Makefile (#545)
woop Mar 18, 2020
52780f3
Update golang protos based on v0.4, protoc 3.10.0
khorshuheng Apr 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,3 +179,8 @@ dmypy.json
.flattened-pom.xml

sdk/python/docs/html
sdk/python/feast/core/
sdk/python/feast/serving/
sdk/python/feast/storage/
sdk/python/feast/types/
sdk/python/tensorflow_metadata
13 changes: 13 additions & 0 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
repos:
- repo: local
hooks:
- id: format
name: Format
stages: [commit]
language: system
entry: make format
- id: lint
name: Lint
stages: [commit]
language: system
entry: make lint
3 changes: 1 addition & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ install-python-ci-dependencies:
compile-protos-python: install-python-ci-dependencies
@$(foreach dir,$(PROTO_TYPE_SUBDIRS),cd ${ROOT_DIR}/protos; python -m grpc_tools.protoc -I. --python_out=../sdk/python/ --mypy_out=../sdk/python/ feast/$(dir)/*.proto;)
@$(foreach dir,$(PROTO_SERVICE_SUBDIRS),cd ${ROOT_DIR}/protos; python -m grpc_tools.protoc -I. --grpc_python_out=../sdk/python/ feast/$(dir)/*.proto;)
cd ${ROOT_DIR}/protos; python -m grpc_tools.protoc -I. --python_out=../sdk/python/ --mypy_out=../sdk/python/ tensorflow_metadata/proto/v0/*.proto

install-python: compile-protos-python
pip install -e sdk/python --upgrade
Expand Down Expand Up @@ -157,4 +156,4 @@ build-html: clean-html
# Build Python SDK documentation
$(MAKE) compile-protos-python
cd $(ROOT_DIR)/sdk/python/docs && $(MAKE) html
cp -r $(ROOT_DIR)/sdk/python/docs/html/* $(ROOT_DIR)/dist/python
cp -r $(ROOT_DIR)/sdk/python/docs/html/* $(ROOT_DIR)/dist/python
5 changes: 5 additions & 0 deletions infra/scripts/test-core-ingestion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#!/usr/bin/env bash

apt-get -qq update
apt-get -y install build-essential

make lint-java

infra/scripts/download-maven-cache.sh \
--archive-uri gs://feast-templocation-kf-feast/.m2.2019-10-24.tar \
--output-dir /root/
Expand Down
3 changes: 2 additions & 1 deletion infra/scripts/test-end-to-end-batch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ This script will run end-to-end tests for Feast Core and Batch Serving.
"

apt-get -qq update
apt-get -y install wget netcat kafkacat
apt-get -y install wget netcat kafkacat build-essential


echo "
Expand Down Expand Up @@ -233,6 +233,7 @@ bash /tmp/miniconda.sh -b -p /root/miniconda -f
source ~/.bashrc

# Install Feast Python SDK and test requirements
make compile-protos-python
pip install -qe sdk/python
pip install -qr tests/e2e/requirements.txt

Expand Down
3 changes: 2 additions & 1 deletion infra/scripts/test-end-to-end.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This script will run end-to-end tests for Feast Core and Online Serving.
"

apt-get -qq update
apt-get -y install wget netcat kafkacat
apt-get -y install wget netcat kafkacat build-essential

echo "
============================================================
Expand Down Expand Up @@ -207,6 +207,7 @@ bash /tmp/miniconda.sh -b -p /root/miniconda -f
source ~/.bashrc

# Install Feast Python SDK and test requirements
make compile-protos-python
pip install -qe sdk/python
pip install -qr tests/e2e/requirements.txt

Expand Down
2 changes: 2 additions & 0 deletions infra/scripts/test-golang-sdk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

set -o pipefail

make lint-go

cd sdk/go
go test -v 2>&1 | tee /tmp/test_output
TEST_EXIT_CODE=$?
Expand Down
7 changes: 5 additions & 2 deletions infra/scripts/test-python-sdk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ set -e
# Default artifact location setting in Prow jobs
LOGS_ARTIFACT_PATH=/logs/artifacts

cd sdk/python
pip install -r requirements-ci.txt
pip install -r sdk/python/requirements-ci.txt
make compile-protos-python
make lint-python

cd sdk/python/
pip install -e .
pytest --junitxml=${LOGS_ARTIFACT_PATH}/python-sdk-test-report.xml
33 changes: 0 additions & 33 deletions protos/Makefile
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions sdk/go/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (fc *GrpcClient) GetOnlineFeatures(ctx context.Context, req *OnlineFeatures
return &OnlineFeaturesResponse{RawResponse: resp}, err
}

// GetInfo gets information about the feast serving instance this client is connected to.
// GetFeastServingInfo gets information about the feast serving instance this client is connected to.
func (fc *GrpcClient) GetFeastServingInfo(ctx context.Context, in *serving.GetFeastServingInfoRequest) (
*serving.GetFeastServingInfoResponse, error) {
span, ctx := opentracing.StartSpanFromContext(ctx, "get_info")
Expand All @@ -62,7 +62,7 @@ func (fc *GrpcClient) GetFeastServingInfo(ctx context.Context, in *serving.GetFe
return fc.cli.GetFeastServingInfo(ctx, in)
}

// Closes the grpc connection.
// Close the grpc connection.
func (fc *GrpcClient) Close() error {
return fc.conn.Close()
}
}
Loading