Lint licenses

executor/Makefile

@@ -104,3 +104,11 @@ clean:
 
 licenses/dep.txt:
 	go list -m all | cut -d ' ' -f 1 > licenses/dep.txt
+
+
+lint: licenses/dep.txt
+	# Check if licenses have changed
+	git \
+		--no-pager diff \
+		--exit-code \
+		./licenses

jenkins-x-lint.yml

@@ -23,4 +23,22 @@ pipelineConfig:
                 args:
                 - -C python
                 - install_dev
-                - run_linter_check
+                - lint 
+          - name: lint-operator
+            agent:
+              image: seldonio/core-builder:0.15
+            steps:
+              - name: lint-operator
+                command: make
+                args:
+                  - -C operator
+                  - lint
+          - name: lint-executor
+            agent:
+              image: seldonio/core-builder:0.15
+            steps:
+              - name: lint-executor
+                command: make
+                args:
+                  - -C executor
+                  - lint

operator/Makefile

@@ -23,6 +23,13 @@ show_image:
 
 all: manager
 
+lint: licenses/dep.txt
+	# Check if licenses have changed
+	git \
+		--no-pager diff \
+		--exit-code \
+		./licenses
+
 # Run tests
 test: generate fmt vet manifests generate-resources
 	ginkgo -r -outputdir=. -cover -coverprofile=cover.out ./controllers ./utils ./apis

python/Makefile

@@ -55,7 +55,7 @@ install_dev:
 
 .PHONY: licenses
 licenses:
-	tox -e licenses
+	tox --recreate -e licenses
 
 .PHONY: uninstall
 uninstall:
@@ -95,16 +95,21 @@ push_conda:
 setup_linter:
 	pip install black==19.3b0
 
-run_linter:
+fmt:
 	black \
 		./ ../testing ../operator/helm ../operator/seldon-operator/hack \
 		--exclude "(testing/scripts/proto|seldon_core/proto/|.eggs|.tox)"
 
-run_linter_check:
+lint: licenses
 	black \
 		--check ./ ../testing \
 		--exclude "(testing/scripts/proto|seldon_core/proto/|.eggs|.tox)"
 	flake8
+	# Check if licenses have changed
+	git \
+		--no-pager diff \
+		--exit-code \
+		./licenses
 
 .PHONY: clean
 clean:

python/licenses/license.txt

@@ -629,7 +629,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 cachetools
-4.1.0
+4.1.1
 MIT License
 The MIT License (MIT)
 
@@ -2717,7 +2717,7 @@ BSD License
 UNKNOWN
 
 idna
-2.9
+2.10
 BSD License
 License
 -------
@@ -2756,7 +2756,7 @@ modification, are permitted provided that the following conditions are met:
 
 
 importlib-metadata
-1.6.1
+1.7.0
 Apache Software License
 Copyright 2017-2019 Jason R. Coombs, Barry Warsaw
 
@@ -4739,7 +4739,7 @@ BSD License
 UNKNOWN
 
 seldon-core
-1.2.1.dev0
+1.2.2.dev0
 Apache 2.0
 UNKNOWN
 
@@ -5558,7 +5558,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 tensorboard-plugin-wit
-1.6.0.post3
+1.7.0
 Apache 2.0
 UNKNOWN
 

python/licenses/license_info.csv

@@ -14,7 +14,7 @@
 "azure-common","1.1.25","MIT License"
 "azure-storage-blob","2.1.0","MIT License"
 "azure-storage-common","2.1.0","MIT License"
-"cachetools","4.1.0","MIT License"
+"cachetools","4.1.1","MIT License"
 "certifi","2020.6.20","Mozilla Public License 2.0 (MPL 2.0)"
 "cffi","1.14.0","MIT License"
 "chardet","3.0.4","GNU Library or Lesser General Public License (LGPL)"
@@ -35,8 +35,8 @@
 "grpcio-opentracing","1.1.4","Apache Software License"
 "gunicorn","20.0.4","MIT License"
 "h5py","2.10.0","BSD License"
-"idna","2.9","BSD License"
-"importlib-metadata","1.6.1","Apache Software License"
+"idna","2.10","BSD License"
+"importlib-metadata","1.7.0","Apache Software License"
 "itsdangerous","1.1.0","BSD License"
 "jaeger-client","4.1.0","Apache Software License"
 "jsonschema","3.2.0","MIT License"
@@ -58,10 +58,10 @@
 "requests-oauthlib","1.3.0","BSD License"
 "rsa","4.6","Apache Software License"
 "scipy","1.4.1","BSD License"
-"seldon-core","1.2.1.dev0","Apache 2.0"
+"seldon-core","1.2.2.dev0","Apache 2.0"
 "six","1.15.0","MIT License"
 "tensorboard","2.2.2","Apache Software License"
-"tensorboard-plugin-wit","1.6.0.post3","Apache 2.0"
+"tensorboard-plugin-wit","1.7.0","Apache 2.0"
 "tensorflow","2.2.0","Apache Software License"
 "tensorflow-estimator","2.2.0","Apache Software License"
 "termcolor","1.1.0","MIT License"

python/setup.cfg

@@ -9,7 +9,7 @@ statistics = True
 
 [tox:tox]
 envlist =
-  py
+  py3
   tensorflow
   gcs
   all
@@ -32,6 +32,7 @@ extras = gcs
 extras = all
 
 [testenv:licenses]
+basepython = python3
 deps =
   pip-licenses
 extras = all