Merge 32cf5c1 into 753d1da

.travis.yml

@@ -21,7 +21,6 @@ before_install:
   - wget http://us.archive.ubuntu.com/ubuntu/pool/universe/w/wrk/wrk_4.0.1-2_amd64.deb
   - sudo dpkg -i wrk_4.0.1-2_amd64.deb
   - rm wrk_4.0.1-2_amd64.deb
-  - pip install --user yq
 install:
   - make jenkins-install
 script:

Makefile

@@ -23,6 +23,7 @@ install:
 	@echo "Mounting git pre-push hook"
 	cp .git-pre-push-hook .git/hooks/pre-push
 	@echo "Installing Glide and locked dependencies..."
+	pip install --user yq
 	glide --version || go get -u -f github.com/Masterminds/glide
 	glide install
 

README.md

@@ -388,9 +388,6 @@ make install
 ```
 make generate
 ```
-If this fails due to `yq: command not found`, then install `yq` by running `pip install yq`.
-If you have already installed `yq` and the build fails due to `unknown command "examples/example-gateway/clients/baz/client-config.yaml" for "yq"` then delete `yq` and reinstall by running `pip install --force-reinstall yq`. This is because Zanzibar uses the python distribution of `yq` so other distributions of `yq` will not work.
-
 ### Running the tests
 
 ```

codegen/runner/pre-steps.sh

@@ -16,6 +16,7 @@ if [ -z "$3" ]; then
 	exit 1
 fi
 
+YQ=$(pip show yq | grep Location | cut -d' ' -f2 | sed 's/lib\/.*/bin\/yq/')
 BUILD_DIR="$1"
 CONFIG_DIR="$2"
 ANNOPREFIX="$3"
@@ -91,7 +92,7 @@ for config_file in ${config_files}; do
 		continue
 	fi
 
-	processor="yq"
+	processor="$YQ"
 	if [[ $config_file == *.json ]]; then
 		processor="jq"
 	fi
@@ -101,7 +102,7 @@ for config_file in ${config_files}; do
 	dir=$(dirname "$config_file")
 	yaml_files=$(find "$dir" -name "*.json" -o -name "*.yaml")
 	for yaml_file in ${yaml_files}; do
-		processor="yq"
+		processor="$YQ"
 		if [[ $yaml_file == *.json ]]; then
 			processor="jq"
 		fi