openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgr...@apache.org
Subject [openwhisk-composer-python] branch master updated: tlp: remove incubator references and disclaimer (#10)
Date Sun, 25 Aug 2019 00:41:10 GMT
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-composer-python.git


The following commit(s) were added to refs/heads/master by this push:
     new ce92f43  tlp: remove incubator references and disclaimer (#10)
ce92f43 is described below

commit ce92f43262330ec85d1a9fa85e69c4453f51412e
Author: David Grove <dgrove-oss@users.noreply.github.com>
AuthorDate: Sat Aug 24 20:41:05 2019 -0400

    tlp: remove incubator references and disclaimer (#10)
    
    * tlp: remove incubator references and disclaimer
    * also tweak async invoke test case so it passes
---
 CONTRIBUTING.md         |  2 +-
 DISCLAIMER.txt          |  1 -
 README.md               | 14 +++++---------
 docs/COMPOSITIONS.md    |  6 +++---
 setup.py                |  4 ++--
 tests/test_conductor.py |  4 ++--
 travis/scancode.sh      |  4 ++--
 travis/setup.sh         |  8 ++++----
 8 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cf5d5b2..05d5ebe 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -57,7 +57,7 @@ A good enhancement request comes with an explanation of what you are trying
to d
 ### Discussion
 
 Please use the project's developer email list to engage our community:
-[dev@openwhisk.incubator.apache.org](dev@openwhisk.incubator.apache.org)
+[dev@openwhisk.apache.org](dev@openwhisk.apache.org)
 
 In addition, we provide a "dev" Slack team channel for conversations at:
 https://openwhisk-team.slack.com/messages/dev/
diff --git a/DISCLAIMER.txt b/DISCLAIMER.txt
deleted file mode 100644
index a7133b7..0000000
--- a/DISCLAIMER.txt
+++ /dev/null
@@ -1 +0,0 @@
-Apache OpenWhisk Composer Python is an effort undergoing incubation at The Apache Software
Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted
projects until a further review indicates that the infrastructure, communications, and decision
making process have stabilized in a manner consistent with other successful ASF projects.
While incubation status is not necessarily a reflection of the completeness or stability of
the code, it does indicat [...]
diff --git a/README.md b/README.md
index 002c7f1..2160d70 100644
--- a/README.md
+++ b/README.md
@@ -18,15 +18,15 @@
 -->
 # composer-python
 
-[![Build Status](https://travis-ci.org/apache/incubator-openwhisk-composer-python.svg?branch=master)](https://travis-ci.org/apache/incubator-openwhisk-composer-python)
+[![Build Status](https://travis-ci.org/apache/openwhisk-composer-python.svg?branch=master)](https://travis-ci.org/apache/openwhisk-composer-python)
 [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Join
 Slack](https://img.shields.io/badge/join-slack-9B69A0.svg)](http://slack.openwhisk.org/)
 
-This repository provides a Python library for [Composer](https://github.com/apache/incubator-openwhisk-composer).
For convenience, the Composer documentation is repeated below using Python bindings instead
of JavaScript.
+This repository provides a Python library for [Composer](https://github.com/apache/openwhisk-composer).
For convenience, the Composer documentation is repeated below using Python bindings instead
of JavaScript.
 
 Composer is a new programming model for composing cloud functions built on
-[Apache OpenWhisk](https://github.com/apache/incubator-openwhisk). With
+[Apache OpenWhisk](https://github.com/apache/openwhisk). With
 Composer, developers can build even more serverless applications including using
 it for IoT, with workflow orchestration, conversation services, and devops
 automation, to name a few examples.
@@ -44,7 +44,7 @@ You need python3.6 installed on your system.
 ### From github
 
 ```bash
-$ git clone https://github.com/apache/incubator-openwhisk-composer-python.git
+$ git clone https://github.com/apache/openwhisk-composer-python.git
 $ cd composer-python
 $ pip3 install -e .
 $ pycompose -h
@@ -145,9 +145,5 @@ actions.
 
 Compositions are implemented by means of OpenWhisk conductor actions. The
 [documentation of conductor
-actions](https://github.com/apache/incubator-openwhisk/blob/master/docs/conductors.md)
+actions](https://github.com/apache/openwhisk/blob/master/docs/conductors.md)
 explains execution traces in greater details.
-
-# Disclaimer
-
-Apache OpenWhisk Composer Python is an effort undergoing incubation at The Apache Software
Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted
projects until a further review indicates that the infrastructure, communications, and decision
making process have stabilized in a manner consistent with other successful ASF projects.
While incubation status is not necessarily a reflection of the completeness or stability of
the code, it does indicat [...]
diff --git a/docs/COMPOSITIONS.md b/docs/COMPOSITIONS.md
index 53e3998..c95c7ba 100644
--- a/docs/COMPOSITIONS.md
+++ b/docs/COMPOSITIONS.md
@@ -124,10 +124,10 @@ Deploying such a composition deploys the embedded actions.
 ## Conductor actions
 
 Compositions are implemented by means of OpenWhisk [conductor
-actions](https://github.com/apache/incubator-openwhisk/blob/master/docs/conductors.md).
+actions](https://github.com/apache/openwhisk/blob/master/docs/conductors.md).
 Compositions have all the attributes and capabilities of an action, e.g.,
 default parameters, limits, blocking invocation, web export. Execution
-[traces](https://github.com/apache/incubator-openwhisk/blob/master/docs/conductors.md#activations)
+[traces](https://github.com/apache/openwhisk/blob/master/docs/conductors.md#activations)
 and
-[limits](https://github.com/apache/incubator-openwhisk/blob/master/docs/conductors.md#limits)
+[limits](https://github.com/apache/openwhisk/blob/master/docs/conductors.md#limits)
 of compositions follow from conductor actions.
diff --git a/setup.py b/setup.py
index a3c6998..63a9775 100644
--- a/setup.py
+++ b/setup.py
@@ -45,9 +45,9 @@ setup(
     license='Apache Software License 2.0',
     description='OpenWhisk Composer for Python',
     long_description='Composer Python is a new programming model for composing cloud functions
built on Apache OpenWhisk.',
-    author='Apache OpenWhisk (incubating) Community',
+    author='Apache OpenWhisk Community',
     author_email='dev@openwhisk.apache.org',
-    url='https://github.com/apache/incubator-openwhisk-composer-python',
+    url='https://github.com/apache/openwhisk-composer-python',
     packages=find_packages('src'),
     package_dir={'': 'src'},
     py_modules=[splitext(basename(path))[0] for path in glob('src/*.py')],
diff --git a/tests/test_conductor.py b/tests/test_conductor.py
index e5a8314..0e29fc4 100644
--- a/tests/test_conductor.py
+++ b/tests/test_conductor.py
@@ -110,8 +110,8 @@ class TestBlockingInvocations:
 
     def test_action_activation_id(self):
         ''' action must return activationId '''
-        activation = invoke(composer.asynchronous('isNotOne'), { 'n': 1 })
-        assert 'activationId' in activation['response']['result']
+        activation = invoke(composer.asynchronous('isNotOne'), { 'n': 1 }, False)
+        assert 'activationId' in activation
 
 
     def test_parse_action_name(self):
diff --git a/travis/scancode.sh b/travis/scancode.sh
index 9e5a9a2..10d1437 100755
--- a/travis/scancode.sh
+++ b/travis/scancode.sh
@@ -7,11 +7,11 @@ set -e
 SCRIPTDIR=$(cd $(dirname "$0") && pwd)
 ROOTDIR="$SCRIPTDIR/../"
 HOMEDIR="$SCRIPTDIR/../../"
-UTIL_DIR="$HOMEDIR/incubator-openwhisk-utilities"
+UTIL_DIR="$HOMEDIR/openwhisk-utilities"
 
 # clone OpenWhisk utilities repo. in order to run scanCode.py
 cd $HOMEDIR
-# git clone https://github.com/apache/incubator-openwhisk-utilities.git
+# git clone https://github.com/apache/openwhisk-utilities.git
 
 # run scancode
 cd $UTIL_DIR
diff --git a/travis/setup.sh b/travis/setup.sh
index e7bdd1b..aa7dd31 100755
--- a/travis/setup.sh
+++ b/travis/setup.sh
@@ -26,13 +26,13 @@ ROOTDIR="$SCRIPTDIR/.."
 WHISKDIR="$ROOTDIR/openwhisk"
 
 # Prefetch docker images
-docker pull openwhisk/controller &
-docker pull openwhisk/invoker &
+docker pull openwhisk/controller:nightly &
+docker pull openwhisk/invoker:nightly &
 docker pull openwhisk/nodejs6action &
 
 # Clone OpenWhisk
 cd $ROOTDIR
-git clone --depth=1 https://github.com/apache/incubator-openwhisk.git openwhisk
+git clone --depth=1 https://github.com/apache/openwhisk.git openwhisk
 
 # Install Ansible
 pip install --user ansible==2.5.2
@@ -42,7 +42,7 @@ cp $SCRIPTDIR/runtimes.json $WHISKDIR/ansible/files
 
 # Deploy OpenWhisk
 cd $WHISKDIR/ansible
-ANSIBLE_CMD="ansible-playbook -i ${WHISKDIR}/ansible/environments/local -e docker_image_prefix=openwhisk"
+ANSIBLE_CMD="ansible-playbook -i ${WHISKDIR}/ansible/environments/local -e docker_image_prefix=openwhisk
-e docker_image_tag=nightly"
 $ANSIBLE_CMD setup.yml
 $ANSIBLE_CMD prereq.yml
 $ANSIBLE_CMD couchdb.yml


Mime
View raw message