Merge branch 'master' of github.com:cortexlabs/cortex into gofmt-ci

cortexlabs · Feb 27, 2019 · 9b4b378 · 9b4b378
2 parents 97015f2 + 02e98c5
commit 9b4b378
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,7 +7,7 @@ jobs:
     steps:
       - checkout
       - run: wget https://dl.google.com/go/go1.11.5.linux-amd64.tar.gz && sudo tar -C /usr/local -xzf go1.11.5.linux-amd64.tar.gz && rm -rf go*.tar.gz && echo 'export PATH=$PATH:/usr/local/go/bin' >> $BASH_ENV && echo 'export PATH=$PATH:~/go/bin' >> $BASH_ENV
-      - run: go get -u -v golang.org/x/lint/golint
+      - run: GO111MODULE=off go get -u -v golang.org/x/lint/golint
       - run: sudo pip3 install black
       - run:
           name: Lint

diff --git a/docs/applications/resources/aggregators.md b/docs/applications/resources/aggregators.md
@@ -2,6 +2,8 @@
 
 An aggregator converts a set of columns and arbitrary values into a single value. Each aggregator has an input schema and an output data type. The input schema is a map which specifies the name and data type of each input column and argument. Aggregators run before transformers.
 
+Custom aggregators can be implemented in Python or PySpark. See the [implementation docs](../implementations/aggregators.md) for a detailed guide.
+
 ## Config
 
 ```yaml

diff --git a/docs/applications/resources/transformers.md b/docs/applications/resources/transformers.md
@@ -2,6 +2,8 @@
 
 A transformer converts a set of columns and arbitrary values into a single transformed column. Each transformer has an input schema and an output data type. The input schema is a map which specifies the name and data type of each input column and argument.
 
+Custom transformers can be implemented in Python or PySpark. See the [implementation docs](../implementations/transformers.md) for a detailed guide.
+
 ## Config
 
 ```yaml