Skip to content

Commit 4d308b4

Browse files
mathieumathieu
committed
Merge branch 'develop'
2 parents 8151ff6 + 39675bf commit 4d308b4

File tree

453 files changed

+31875
-4525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

453 files changed

+31875
-4525
lines changed

‎.github/ISSUE_TEMPLATE/defect.md

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
name: Defect
3+
about: Use this template to create new defects
4+
labels: bug
5+
assignees: mathieu
6+
title: SHORT_DESCRIPTION
7+
---
8+
9+
LONG_DESCRIPTION
10+
11+
## Steps for reproducing
12+
13+
- STEP_1
14+
- STEP_2
15+
- STEP_3
16+
17+
## Acceptance criteria
18+
19+
- [ ] EXPECTED_RESULTS
20+
21+
<!--
22+
23+
Replace SHORT_DESCRIPTION with a short description of the defect and LONG_DESCRIPTION with a detailed explanation of the issue.
24+
25+
Ideally provide a way to reproduce and expected results.
26+
27+
-->

‎.github/ISSUE_TEMPLATE/feature.md

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
name: Feature
3+
about: Use this template to propose new features
4+
labels: enhancement
5+
assignees: mathieu
6+
title: SHORT_DESCRIPTION
7+
---
8+
9+
LONG_DESCRIPTION
10+
11+
<!--
12+
13+
Replace SHORT_DESCRIPTION with a short description of the work item and LONG_DESCRIPTION with a detailed explanation of the work to do.
14+
-->

‎.github/ISSUE_TEMPLATE/story.md

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
name: Story
3+
about: Use this template to create new Stories not code related
4+
labels: Story
5+
assignees: Mathieu-Marache
6+
title: SHORT_DESCRIPTION
7+
---
8+
9+
LONG_DESCRIPTION
10+
11+
---
12+
Check list
13+
14+
- [ ] related to an Epic
15+
- [ ] Assigned to a release
16+
17+
<!--
18+
19+
Replace SHORT_DESCRIPTION with a short description of the work item and LONG_DESCRIPTION with a detailed explanation of the work to do.
20+
21+
Make sure that each check list item is done (via ZenHub extension).
22+
23+
-->

‎.github/dco.yml

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

‎.github/pull_request_template.md

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
SHORT_DESCRIPTION
2+
3+
LONG_DESCRIPTION
4+
5+
---
6+
Check list
7+
8+
- [ ] added a changelog entry
9+
- [ ] referenced an issue
10+
11+
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)
12+
13+
<!--
14+
15+
Replace SHORT_DESCRIPTION with a short description of the modifications this
16+
pull request proposes. Use LONG_DESCRIPTION to provide some details on changes introduced.
17+
18+
Make sure that each check list item is done (via ZenHub extension).
19+
20+
To add a changelog entry please use this tool https://github.com/mathieu/changelog-cli
21+
22+
-->

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -281,3 +281,6 @@ buildNumber.properties
281281
# ------- This project ----------------
282282
.idea
283283
*.iml
284+
.vscode
285+
ml-service-implementations/sklearn-service/.project
286+
.hypothesis

‎.travis.yml

+38-34
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,45 @@
1-
dist: bionic
21
language: python
32
python:
43
- "3.7"
54

6-
notifications:
7-
email: false
8-
5+
# Additional services for testing and deployment
96
services:
107
- docker
118

12-
before_install:
13-
- cd ml-service-implementations/ads-ml-service
14-
- pip3 install --quiet --upgrade pip
15-
- pip3 install --quiet -r requirements-test.txt
16-
- pip3 install --quiet -r requirements-ml.txt
17-
- pip3 install --quiet -r requirements.txt
18-
19-
install:
20-
- python3 setup.py install --quiet
21-
22-
script:
23-
- python3 -m pytest -v src/tests
24-
25-
26-
before_deploy:
27-
- export DEPLOY_TIMESTAMP=$(date +'%Y%m%d-%H%M%S')
28-
# example: demo:20190405-171003-4-master
29-
# '/' is replaces by -
30-
- docker build -t open-prediction:${DEPLOY_TIMESTAMP}-${TRAVIS_BUILD_NUMBER}-${TRAVIS_BRANCH//[\/]/-} -t open-prediction:latest -f Dockerfile .
31-
32-
# Needed to install IBM cloud cli
33-
sudo: required
34-
35-
deploy:
36-
- provider: script
37-
skip_cleanup: true
38-
script: chmod +x kubernetes/* && kubernetes/ibm_image_registry.sh
39-
on:
40-
all_branches: true
41-
condition: ${TRAVIS_BRANCH} =~ ^release.*$
9+
stages:
10+
- name: testing
11+
- name: deploy
12+
if: branch IN (master, develop, release/2020Q3) AND env(DOCKER_REGISTRY_URL) IS NOT blank
13+
14+
jobs:
15+
include:
16+
- stage: testing
17+
script:
18+
- cd ops-implementations/ads-ml-service
19+
- pip3 install --quiet --upgrade pip
20+
- pip3 install --quiet datamodel-code-generator~=0.5.30
21+
- pip3 install --quiet -r requirements-ml.txt
22+
- pip3 install --quiet -r requirements.txt --ignore-installed
23+
- cp ../../open-prediction-service.yaml app/gen/tmp.schemas.ops.yaml
24+
- 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
25+
- python3 -m pytest -v app/tests
26+
name: "ads-ml-service-test"
27+
- script:
28+
- cd ops-implementations/wml-service
29+
- pip3 install --quiet tox
30+
- tox
31+
name: "wml-proxy-test"
32+
- script:
33+
- cd ops-implementations/sagemaker-service
34+
- pip3 install --quiet tox
35+
- tox
36+
name: "sagemaker-proxy-test"
37+
- stage: deploy
38+
script:
39+
- cp open-prediction-service.yaml ops-implementations/ads-ml-service/app/gen/tmp.schemas.ops.yaml
40+
- ops-implementations/deploy.sh ads-ml-service
41+
name: "ads-ml-service-deploy"
42+
- script: ops-implementations/deploy.sh wml-service
43+
name: "wml-proxy-deploy"
44+
- script: ops-implementations/deploy.sh sagemaker-service
45+
name: "sagemaker-proxy-deploy"

‎CHANGELOG.md

+9-11
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
# Open Prediction Service
22

3-
## 0.1.0
3+
## 2.0.0
44

5-
* RTC-130468 Refactor OPS project structure and naming
6-
* RTC-130348 Add cache for OPS model storage
5+
- Releasing OPS v2
76

8-
-- Ke Li <[email protected]> Tue, 23 June 2020 17:20:44 +0200
7+
## 0.1.0
98

10-
## 0.0.2
9+
- RTC-130468 Refactor OPS project structure and naming
10+
- RTC-130348 Add cache for OPS model storage
1111

12-
* RTC-130175 Reduce the docker image size of the ads-ml-service
12+
## 0.0.2
1313

14-
-- Ke Li <[email protected]> Tue, 26 May 2020 16:26:40 +0200
14+
- RTC-130175 Reduce the docker image size of the ads-ml-service
1515

1616
## 0.0.1
1717

18-
* Added changelog
19-
* Makefile test use dev image instead of master
20-
21-
-- Ke Li <[email protected]> Tue, 26 May 2020 10:04:25 +0200
18+
- Added changelog
19+
- Makefile test use dev image instead of master

‎CONTRIBUTING.md

+89
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# Contributing
2+
3+
## Contributing In General
4+
5+
Our project welcomes external contributions. If you have an itch, please feel
6+
free to scratch it.
7+
8+
To contribute code or documentation, please submit a [pull request](https://github.com/ibm/open-prediction-service-hub/pulls).
9+
10+
A good way to familiarize yourself with the codebase and contribution process is
11+
to look for and tackle low-hanging fruit in the [issue tracker](https://github.com/ibm/open-prediction-service-hub/issues).
12+
Before embarking on a more ambitious contribution, please quickly [get in touch](#communication) with us.
13+
14+
**Note: We appreciate your effort, and want to avoid a situation where a contribution
15+
requires extensive rework (by you or by us), sits in backlog for a long time, or
16+
cannot be accepted at all!**
17+
18+
### Proposing new features
19+
20+
If you would like to implement a new feature, please [raise an issue](https://github.com/ibm/open-prediction-service-hub/issues)
21+
before sending a pull request so the feature can be discussed. This is to avoid
22+
you wasting your valuable time working on a feature that the project developers
23+
are not interested in accepting into the code base.
24+
25+
### Fixing bugs
26+
27+
If you would like to fix a bug, please [raise an issue](https://github.com/ibm/open-prediction-service-hub/issues) before sending a
28+
pull request so it can be tracked.
29+
30+
### Merge approval
31+
32+
The project maintainers use LGTM (Looks Good To Me) in comments on the code
33+
review to indicate acceptance. A change requires LGTMs from one of the
34+
maintainers of each component affected.
35+
36+
For a list of the maintainers, see the [MAINTAINERS.md](MAINTAINERS.md) page.
37+
38+
## Legal
39+
40+
Each source file must include a license header for the Apache
41+
Software License 2.0. Using the SPDX format is the simplest approach.
42+
e.g.
43+
44+
```text
45+
/*
46+
Copyright <holder> All Rights Reserved.
47+
48+
SPDX-License-Identifier: Apache-2.0
49+
*/
50+
```
51+
52+
We have tried to make it as easy as possible to make contributions. This
53+
applies to how we handle the legal aspects of contribution. We use the
54+
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)
55+
uses to manage code contributions.
56+
57+
We simply ask that when submitting a patch for review, the developer
58+
must include a sign-off statement in the commit message.
59+
60+
Here is an example Signed-off-by line, which indicates that the
61+
submitter accepts the DCO:
62+
63+
```text
64+
Signed-off-by: John Doe <[email protected]>
65+
```
66+
67+
You can include this automatically when you commit a change to your
68+
local git repository using the following command:
69+
70+
```shell
71+
git commit -s
72+
```
73+
74+
<!--
75+
## Communication
76+
Please feel free to connect with us by entering an issue in our [issue tracker](https://github.com/ibm/open-prediction-service-hub/issues).
77+
78+
## Setup
79+
**FIXME** Please add any special setup instructions for your project to help the developer
80+
become productive quickly.
81+
82+
## Testing
83+
**FIXME** Please provide information that helps the developer test any changes they make
84+
before submitting.
85+
86+
## Coding style guidelines
87+
**FIXME** Optional, but recommended: please share any specific style guidelines you might
88+
have for your project.
89+
-->

0 commit comments

Comments
 (0)