Merge branch 'develop'

.github/ISSUE_TEMPLATE/defect.md

@@ -0,0 +1,27 @@
+---
+name: Defect
+about: Use this template to create new defects
+labels: bug
+assignees: mathieu
+title: SHORT_DESCRIPTION
+---
+
+LONG_DESCRIPTION
+
+## Steps for reproducing
+
+- STEP_1
+- STEP_2
+- STEP_3
+
+## Acceptance criteria
+
+- [ ] EXPECTED_RESULTS
+
+<!--
+
+  Replace SHORT_DESCRIPTION with a short description of the defect and LONG_DESCRIPTION with a detailed explanation of the issue.
+
+  Ideally provide a way to reproduce and expected results.
+
+-->

.github/ISSUE_TEMPLATE/feature.md

@@ -0,0 +1,14 @@
+---
+name: Feature
+about: Use this template to propose new features
+labels: enhancement
+assignees: mathieu
+title: SHORT_DESCRIPTION
+---
+
+LONG_DESCRIPTION
+
+<!--
+
+  Replace SHORT_DESCRIPTION with a short description of the work item and LONG_DESCRIPTION with a detailed explanation of the work to do.
+-->

.github/ISSUE_TEMPLATE/story.md

@@ -0,0 +1,23 @@
+---
+name: Story
+about: Use this template to create new Stories not code related
+labels: Story
+assignees: Mathieu-Marache
+title: SHORT_DESCRIPTION
+---
+
+LONG_DESCRIPTION
+
+---
+Check list
+
+- [ ] related to an Epic
+- [ ] Assigned to a release
+
+<!--
+
+  Replace SHORT_DESCRIPTION with a short description of the work item and LONG_DESCRIPTION with a detailed explanation of the work to do.
+
+  Make sure that each check list item is done (via ZenHub extension).
+
+-->

.github/dco.yml

@@ -0,0 +1,4 @@
+# This enables DCO bot for you, please take a look https://github.com/probot/dco
+# for more details.
+require:
+  members: false

.github/pull_request_template.md

@@ -0,0 +1,22 @@
+SHORT_DESCRIPTION
+
+LONG_DESCRIPTION
+
+---
+Check list
+
+- [ ] added a changelog entry
+- [ ] referenced an issue
+
+Can be merged if main build is passing : [![Build Status](https://travis-ci.com/IBM/open-prediction-service-hub.svg?branch=main)](https://travis-ci.com/IBM/open-prediction-service-hub)
+
+<!--
+
+  Replace SHORT_DESCRIPTION with a short description of the modifications this
+  pull request proposes. Use LONG_DESCRIPTION to provide some details on changes introduced.
+
+  Make sure that each check list item is done (via ZenHub extension).
+
+  To add a changelog entry please use this tool https://github.com/mathieu/changelog-cli
+
+-->

.gitignore

@@ -281,3 +281,6 @@ buildNumber.properties
 # ------- This project ----------------
 .idea
 *.iml
+.vscode
+ml-service-implementations/sklearn-service/.project
+.hypothesis

.travis.yml

@@ -1,41 +1,45 @@
-dist: bionic
 language: python
 python:
   - "3.7"
 
-notifications:
-  email: false
-
+# Additional services for testing and deployment
 services:
   - docker
 
-before_install:
-  - cd ml-service-implementations/ads-ml-service
-  - pip3 install --quiet --upgrade pip
-  - pip3 install --quiet -r requirements-test.txt
-  - pip3 install --quiet -r requirements-ml.txt
-  - pip3 install --quiet -r requirements.txt
-
-install:
-  - python3 setup.py install --quiet
-
-script:
-  - python3 -m pytest -v src/tests
-
-
-before_deploy:
-  - export DEPLOY_TIMESTAMP=$(date +'%Y%m%d-%H%M%S')
-  # example: demo:20190405-171003-4-master
-  # '/' is replaces by -
-  - docker build -t open-prediction:${DEPLOY_TIMESTAMP}-${TRAVIS_BUILD_NUMBER}-${TRAVIS_BRANCH//[\/]/-} -t open-prediction:latest -f Dockerfile .
-
-# Needed to install IBM cloud cli
-sudo: required
-
-deploy:
-  - provider: script
-    skip_cleanup: true
-    script: chmod +x kubernetes/* && kubernetes/ibm_image_registry.sh
-    on:
-      all_branches: true
-      condition: ${TRAVIS_BRANCH} =~ ^release.*$
+stages:
+  - name: testing
+  - name: deploy
+    if: branch IN (master, develop, release/2020Q3) AND env(DOCKER_REGISTRY_URL) IS NOT blank
+
+jobs:
+  include:
+    - stage: testing
+      script:
+        - cd ops-implementations/ads-ml-service
+        - pip3 install --quiet --upgrade pip
+        - pip3 install --quiet datamodel-code-generator~=0.5.30
+        - pip3 install --quiet -r requirements-ml.txt
+        - pip3 install --quiet -r requirements.txt --ignore-installed
+        - cp ../../open-prediction-service.yaml app/gen/tmp.schemas.ops.yaml
+        - datamodel-codegen --input app/gen/tmp.schemas.ops.yaml --input-file-type openapi --target-python-version 3.7 --output app/gen/schemas/ops_schemas.py
+        - python3 -m pytest -v app/tests
+      name: "ads-ml-service-test"
+    - script:
+      - cd ops-implementations/wml-service
+      - pip3 install --quiet tox
+      - tox
+      name: "wml-proxy-test"
+    - script:
+      - cd ops-implementations/sagemaker-service
+      - pip3 install --quiet tox
+      - tox
+      name: "sagemaker-proxy-test"
+    - stage: deploy
+      script:
+        - cp open-prediction-service.yaml ops-implementations/ads-ml-service/app/gen/tmp.schemas.ops.yaml
+        - ops-implementations/deploy.sh ads-ml-service
+      name: "ads-ml-service-deploy"
+    - script: ops-implementations/deploy.sh wml-service
+      name: "wml-proxy-deploy"
+    - script: ops-implementations/deploy.sh sagemaker-service
+      name: "sagemaker-proxy-deploy"

CHANGELOG.md

@@ -1,21 +1,19 @@
 # Open Prediction Service
 
-## 0.1.0
+## 2.0.0
 
-  * RTC-130468 Refactor OPS project structure and naming
-  * RTC-130348 Add cache for OPS model storage
+- Releasing OPS v2
 
- -- Ke Li <[email protected]>  Tue, 23 June 2020 17:20:44 +0200
+## 0.1.0
 
-## 0.0.2
+- RTC-130468 Refactor OPS project structure and naming
+- RTC-130348 Add cache for OPS model storage
 
-  * RTC-130175 Reduce the docker image size of the ads-ml-service
+## 0.0.2
 
- -- Ke Li <[email protected]>  Tue, 26 May 2020 16:26:40 +0200
+- RTC-130175 Reduce the docker image size of the ads-ml-service
 
 ## 0.0.1
 
-  * Added changelog
-  * Makefile test use dev image instead of master
-
- -- Ke Li <[email protected]>  Tue, 26 May 2020 10:04:25 +0200
+- Added changelog
+- Makefile test use dev image instead of master

CONTRIBUTING.md

@@ -0,0 +1,89 @@
+# Contributing
+
+## Contributing In General
+
+Our project welcomes external contributions. If you have an itch, please feel
+free to scratch it.
+
+To contribute code or documentation, please submit a [pull request](https://github.com/ibm/open-prediction-service-hub/pulls).
+
+A good way to familiarize yourself with the codebase and contribution process is
+to look for and tackle low-hanging fruit in the [issue tracker](https://github.com/ibm/open-prediction-service-hub/issues).
+Before embarking on a more ambitious contribution, please quickly [get in touch](#communication) with us.
+
+**Note: We appreciate your effort, and want to avoid a situation where a contribution
+requires extensive rework (by you or by us), sits in backlog for a long time, or
+cannot be accepted at all!**
+
+### Proposing new features
+
+If you would like to implement a new feature, please [raise an issue](https://github.com/ibm/open-prediction-service-hub/issues)
+before sending a pull request so the feature can be discussed. This is to avoid
+you wasting your valuable time working on a feature that the project developers
+are not interested in accepting into the code base.
+
+### Fixing bugs
+
+If you would like to fix a bug, please [raise an issue](https://github.com/ibm/open-prediction-service-hub/issues) before sending a
+pull request so it can be tracked.
+
+### Merge approval
+
+The project maintainers use LGTM (Looks Good To Me) in comments on the code
+review to indicate acceptance. A change requires LGTMs from one of the
+maintainers of each component affected.
+
+For a list of the maintainers, see the [MAINTAINERS.md](MAINTAINERS.md) page.
+
+## Legal
+
+Each source file must include a license header for the Apache
+Software License 2.0. Using the SPDX format is the simplest approach.
+e.g.
+
+```text
+/*
+Copyright <holder> All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+```
+
+We have tried to make it as easy as possible to make contributions. This
+applies to how we handle the legal aspects of contribution. We use the
+same approach - the [Developer's Certificate of Origin 1.1 (DCO)](https://github.com/hyperledger/fabric/blob/master/docs/source/DCO1.1.txt) - that the Linux® Kernel [community](https://elinux.org/Developer_Certificate_Of_Origin)
+uses to manage code contributions.
+
+We simply ask that when submitting a patch for review, the developer
+must include a sign-off statement in the commit message.
+
+Here is an example Signed-off-by line, which indicates that the
+submitter accepts the DCO:
+
+```text
+Signed-off-by: John Doe <[email protected]>
+```
+
+You can include this automatically when you commit a change to your
+local git repository using the following command:
+
+```shell
+git commit -s
+```
+
+<!--
+## Communication
+Please feel free to connect with us by entering an issue in our [issue tracker](https://github.com/ibm/open-prediction-service-hub/issues).
+
+## Setup
+**FIXME** Please add any special setup instructions for your project to help the developer
+become productive quickly.
+
+## Testing
+**FIXME** Please provide information that helps the developer test any changes they make
+before submitting.
+
+## Coding style guidelines
+**FIXME** Optional, but recommended: please share any specific style guidelines you might
+have for your project.
+-->