You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by dg...@apache.org on 2020/09/30 13:41:16 UTC
[openwhisk-runtime-python] branch master updated (8874202 ->
4e43668)
This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-python.git.
from 8874202 Update to golang:1.15 and buster. (#90)
new beccc13 build proxy from 1.16.0 release of openwhisk-runtime-go
new 4e43668 exclude directive not working; just remove unmaintained Python2 tests
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
core/python2ActionLoop/Dockerfile | 4 +--
core/python3ActionLoop/Dockerfile | 4 +--
core/python3AiActionLoop/Dockerfile | 4 +--
tests/build.gradle | 2 --
.../Python2ActionLoopContainerTests.scala | 36 ----------------------
5 files changed, 6 insertions(+), 44 deletions(-)
delete mode 100644 tests/src/test/scala/runtime/actionContainers/Python2ActionLoopContainerTests.scala
[openwhisk-runtime-python] 01/02: build proxy from 1.16.0 release
of openwhisk-runtime-go
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-python.git
commit beccc133eabea0963acbe96c7321c27bd142588f
Author: David Grove <gr...@us.ibm.com>
AuthorDate: Mon Sep 28 20:52:47 2020 -0400
build proxy from 1.16.0 release of openwhisk-runtime-go
---
core/python2ActionLoop/Dockerfile | 4 ++--
core/python3ActionLoop/Dockerfile | 4 ++--
core/python3AiActionLoop/Dockerfile | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/python2ActionLoop/Dockerfile b/core/python2ActionLoop/Dockerfile
index 1624c5d..043315c 100644
--- a/core/python2ActionLoop/Dockerfile
+++ b/core/python2ActionLoop/Dockerfile
@@ -26,7 +26,7 @@ RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
# or build it from a release
FROM golang:1.15 AS builder_release
-ARG GO_PROXY_RELEASE_VERSION=1.12@1.15.0
+ARG GO_PROXY_RELEASE_VERSION=1.15@1.16.0
RUN curl -sL \
https://github.com/apache/openwhisk-runtime-go/archive/{$GO_PROXY_RELEASE_VERSION}.tar.gz\
| tar xzf -\
@@ -35,7 +35,7 @@ RUN curl -sL \
FROM python:2.7-alpine
# select the builder to use
-ARG GO_PROXY_BUILD_FROM=source
+ARG GO_PROXY_BUILD_FROM=release
# Upgrade and install basic Python dependencies
RUN apk add --no-cache \
diff --git a/core/python3ActionLoop/Dockerfile b/core/python3ActionLoop/Dockerfile
index 0ce04cd..5edc5d3 100644
--- a/core/python3ActionLoop/Dockerfile
+++ b/core/python3ActionLoop/Dockerfile
@@ -25,7 +25,7 @@ RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
# or build it from a release
FROM golang:1.15 AS builder_release
-ARG GO_PROXY_RELEASE_VERSION=1.12@1.15.0
+ARG GO_PROXY_RELEASE_VERSION=1.15@1.16.0
RUN curl -sL \
https://github.com/apache/openwhisk-runtime-go/archive/{$GO_PROXY_RELEASE_VERSION}.tar.gz\
| tar xzf -\
@@ -33,7 +33,7 @@ RUN curl -sL \
&& GO111MODULE=on go build -o /bin/proxy
FROM python:3.7-buster
-ARG GO_PROXY_BUILD_FROM=source
+ARG GO_PROXY_BUILD_FROM=release
# Install common modules for python
RUN pip install \
diff --git a/core/python3AiActionLoop/Dockerfile b/core/python3AiActionLoop/Dockerfile
index 54c6038..114c145 100644
--- a/core/python3AiActionLoop/Dockerfile
+++ b/core/python3AiActionLoop/Dockerfile
@@ -26,7 +26,7 @@ RUN git clone --branch ${GO_PROXY_GITHUB_BRANCH} \
# or build it from a release
FROM golang:1.15 AS builder_release
-ARG GO_PROXY_RELEASE_VERSION=1.12@1.15.0
+ARG GO_PROXY_RELEASE_VERSION=1.15@1.16.0
RUN curl -sL \
https://github.com/apache/openwhisk-runtime-go/archive/${GO_PROXY_RELEASE_VERSION}.tar.gz\
| tar xzf -\
@@ -37,7 +37,7 @@ RUN curl -sL \
FROM tensorflow/tensorflow:1.15.2-py3-jupyter
# select the builder to use
-ARG GO_PROXY_BUILD_FROM=source
+ARG GO_PROXY_BUILD_FROM=release
RUN apt-get update && apt-get upgrade -y && apt-get install -y \
curl \
[openwhisk-runtime-python] 02/02: exclude directive not working;
just remove unmaintained Python2 tests
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-python.git
commit 4e43668e99d9f40c20e4537a7b1656a60f7fb6f4
Author: David Grove <gr...@us.ibm.com>
AuthorDate: Wed Sep 30 09:07:11 2020 -0400
exclude directive not working; just remove unmaintained Python2 tests
---
tests/build.gradle | 2 --
.../Python2ActionLoopContainerTests.scala | 36 ----------------------
2 files changed, 38 deletions(-)
diff --git a/tests/build.gradle b/tests/build.gradle
index 01e8bde..e720728 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -44,8 +44,6 @@ tasks.withType(ScalaCompile) {
}
task testPython3(type: Test) {
- // python2 is end-of-life and the runtime not built by default
- exclude 'scala/runtime/actionContainers/Python2ActionLoopContainerTests'
}
task buildArtifacts(type:Exec) {
diff --git a/tests/src/test/scala/runtime/actionContainers/Python2ActionLoopContainerTests.scala b/tests/src/test/scala/runtime/actionContainers/Python2ActionLoopContainerTests.scala
deleted file mode 100644
index 23dae23..0000000
--- a/tests/src/test/scala/runtime/actionContainers/Python2ActionLoopContainerTests.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package runtime.actionContainers
-
-import common.WskActorSystem
-import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
-
-@RunWith(classOf[JUnitRunner])
-class Python2ActionLoopContainerTests
- extends PythonActionContainerTests
- with PythonActionLoopExtraTests
- with WskActorSystem {
-
- override lazy val imageName = "actionloop-python-v2.7"
-
- override val testNoSource = TestConfig("", hasCodeStub = false)
-
- /** actionloop based image does not log init errors - return the error in the body */
- override lazy val errorCodeOnRun = false
-}