Skip to content

Commit 772879b

Browse files
csantanaprcsantanapr
authored
New python:3.7 and renames python:3.6 (ibm-functions#61)
1 parent 101452f commit 772879b

37 files changed

Lines changed: 682 additions & 126 deletions

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,7 @@ out/
3030
#Python
3131
virtualenv/
3232

33+
.settings/
34+
bin/
35+
.project
36+

‎.travis.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,17 @@ script:
1111
- "./tools/travis/build.sh && ./tools/travis/deploy.sh && ./tools/travis/test.sh"
1212
deploy:
1313
- provider: script
14-
script: "./tools/travis/publish.sh ibmfunctions master"
14+
script: "./tools/travis/publish.sh ibmfunctions ${TRAVIS_TAG%@*} ${TRAVIS_TAG##*@}"
1515
on:
16-
branch: master
16+
tags: true
17+
all_branches: true
1718
repo: ibm-functions/runtime-python
1819
- provider: script
19-
script: "./tools/travis/publish.sh ibmfunctions $TRAVIS_TAG"
20+
script: "./tools/travis/publish.sh ibmfunctions 3.6 master && ./tools/travis/publish.sh ibmfunctions 3.7 master "
2021
on:
21-
tags: true
22-
all_branches: true
22+
branch: master
2323
repo: ibm-functions/runtime-python
24+
2425
env:
2526
global:
2627
- secure: QTl+38OboTb8QyI6FqOyXEx932GNbEx25dSz4dITvXgItBk4cWhq1MKFy2qmbXlZE4Xt1I8Jqrx4DVv0uuyJJN4tA9B7g8L0Bul87ataL9x8fAM4o3q3OBNxvlQ7R7FesQHeYB6W+v8t89BCHrQgq+YMZCsCHto1Z+BkpZlUryiQJd2oiMICP05GPMk87VSFNVJNeSKhpcOB6A/QfgIWVs6pl+JdB/KbVwL1oEysHwguUfMIWKwhEqFTQRuspTxd6OEEUuxGMoxTuEirj02uZQB/H4xzQcC5DdyjD66XYVAlkar/6eYuLA7DaW4WUxoixc+92PDe9vZC43g2mDXNMF82R50LoOdI8kyP8libKnBhw1BRR7u5zTIVj3Hckqf894K5YGqA3mVhTTxuAjBdcYJBvnNhWstpE3p8fl7qARk1pkyUB6c2CS2JC504gKxqh6HVNOGd9edNo9+N8NKAFhwXNniXkpFcEBa1TmWn0zVBTlBFm5EwtNKVFpyyIlf2DIqUUnCHg2qxL5Kp4wC98syiJCB6PXov7V97p0Y5enwGBTO4CEtgmnK1XcZenWcJvFUETSMNVZ5whDlYgT1atdULo77pHA1QxTaVsX/eyAHgpdQdP5iRSdMZSL6myOhj22UEeziam/iGouqMb7PZg8SSMpLomkjZ/A6caGI8DTQ=

‎ansible/environments/local/group_vars/all‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,17 @@ runtimes_manifest:
4343
- kind: "python-jessie:3"
4444
default: false
4545
image:
46-
name: "action-python-v3"
46+
name: "action-python-v3.6"
47+
deprecated: false
48+
- kind: "python:3.6"
49+
default: false
50+
image:
51+
name: "action-python-v3.6"
52+
deprecated: false
53+
- kind: "python:3.7"
54+
default: false
55+
image:
56+
name: "action-python-v3.7"
4757
deprecated: false
4858
blackboxes:
4959
- name: "dockerskeleton"

python3/CHANGELOG.md renamed to python3.6/CHANGELOG.md

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,85 @@
11
# IBM Functions Python 3 Runtime Container
22

3+
## 1.12.0
4+
- update cassandra-driver from `3.14.0` to `3.15.1`
5+
- update cloudant from `2.9.0` to `2.10.0`
6+
- update ibm-cos-sdk from `2.1.3` to `2.3.0`
7+
- update lxml from `4.2.4` to `4.2.5`
8+
- update numpy from `1.15.0` to `1.15.2`
9+
- update scikit-learn from `0.19.2` to `0.20.0`
10+
- update watson-developer-cloud from `1.7.0` to `1.7.1`
11+
12+
Python version:
13+
- [3.6.6](https://github.com/docker-library/python/blob/878ffe36c2391279e673a44a011f5c65943b5eb8/3.6/jessie/Dockerfile)
14+
15+
Python packages:
16+
- asn1crypto==0.24.0
17+
- attrs==18.2.0
18+
- autobahn==18.9.2
19+
- Automat==0.7.0
20+
- beautifulsoup4==4.6.3
21+
- botocore==1.12.13
22+
- cassandra-driver==3.15.1
23+
- certifi==2018.8.24
24+
- cffi==1.11.5
25+
- chardet==3.0.4
26+
- Click==7.0
27+
- cloudant==2.10.0
28+
- constantly==15.1.0
29+
- cryptography==2.3.1
30+
- cssselect==1.0.3
31+
- docutils==0.14
32+
- elasticsearch==5.5.3
33+
- Flask==1.0.2
34+
- gevent==1.3.6
35+
- greenlet==0.4.15
36+
- httplib2==0.11.3
37+
- hyperlink==18.0.0
38+
- ibm-cos-sdk==2.3.0
39+
- ibm-db==2.0.9
40+
- ibmcloudsql==0.2.13
41+
- idna==2.7
42+
- incremental==17.5.0
43+
- itsdangerous==0.24
44+
- Jinja2==2.10
45+
- jmespath==0.9.3
46+
- kafka-python==1.4.3
47+
- lxml==4.2.5
48+
- MarkupSafe==1.0
49+
- numpy==1.15.2
50+
- pandas==0.23.4
51+
- parsel==1.5.0
52+
- pika==0.12.0
53+
- Pillow==5.2.0
54+
- psycopg2==2.7.5
55+
- pyasn1==0.4.4
56+
- pyasn1-modules==0.2.2
57+
- pycparser==2.19
58+
- PyDispatcher==2.0.5
59+
- PyHamcrest==1.9.0
60+
- pymongo==3.7.1
61+
- pyOpenSSL==18.0.0
62+
- python-dateutil==2.7.3
63+
- pytz==2018.5
64+
- queuelib==1.5.0
65+
- redis==2.10.6
66+
- requests==2.19.1
67+
- scikit-learn==0.20.0
68+
- scipy==1.1.0
69+
- Scrapy==1.5.1
70+
- service-identity==17.0.0
71+
- simplejson==3.16.0
72+
- six==1.11.0
73+
- tornado==4.5.2
74+
- Twisted==18.7.0
75+
- txaio==18.8.1
76+
- urllib3==1.23
77+
- virtualenv==16.0.0
78+
- w3lib==1.19.0
79+
- watson-developer-cloud==1.7.1
80+
- Werkzeug==0.14.1
81+
- zope.interface==4.5.0
82+
383
## 1.11.0
484
- update runtime to allow more environment variables via invoker run
585
- update beautifulsoup4 from `4.6.0` to `4.6.3`

python3/Dockerfile renamed to python3.6/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ COPY requirements.txt requirements.txt
2020

2121
RUN pip install --upgrade pip setuptools six && pip install --no-cache-dir -r requirements.txt
2222

23+
# create action working directory
24+
RUN mkdir -p /action
25+
2326
RUN mkdir -p /actionProxy
24-
ADD https://raw.githubusercontent.com/apache/incubator-openwhisk-runtime-docker/dockerskeleton%401.3.3/core/actionProxy/actionproxy.py /actionProxy/actionproxy.py
27+
ADD https://raw.githubusercontent.com/apache/incubator-openwhisk-runtime-docker/8b2e205c39d84ed5ede6b1b08cccf314a2b13105/core/actionProxy/actionproxy.py /actionProxy/actionproxy.py
2528

2629
RUN mkdir -p /pythonAction
2730
ADD https://raw.githubusercontent.com/apache/incubator-openwhisk-runtime-python/3%401.0.3/core/pythonAction/pythonrunner.py /pythonAction/pythonrunner.py

‎python3.6/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ext.dockerImageName = 'action-python-v3.6'
2+
apply from: '../gradle/docker.gradle'

python3/requirements.txt renamed to python3.6/requirements.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Requirements.txt contains a list of dependencies for the Python Application #
22

33
# Setup modules
4-
gevent == 1.2.2
4+
gevent == 1.3.6
55
flask == 1.0.2
66

77
# default available packages for python3action
88
beautifulsoup4 == 4.6.3
99
httplib2 == 0.11.3
1010
kafka_python == 1.4.3
11-
lxml == 4.2.4
11+
lxml == 4.2.5
1212
python-dateutil == 2.7.3
1313
requests == 2.19.1
1414
scrapy == 1.5.1
@@ -17,8 +17,8 @@ virtualenv == 16.0.0
1717
twisted == 18.7.0
1818

1919
# packages for numerics
20-
numpy == 1.15.0
21-
scikit-learn == 0.19.2
20+
numpy == 1.15.2
21+
scikit-learn == 0.20.0
2222
scipy == 1.1.0
2323
pandas == 0.23.4
2424

@@ -27,9 +27,9 @@ Pillow == 5.2.0
2727

2828
# IBM specific python modules
2929
ibm_db == 2.0.9
30-
cloudant == 2.9.0
31-
watson-developer-cloud == 1.7.0
32-
ibm-cos-sdk == 2.1.3
30+
cloudant == 2.10.0
31+
watson-developer-cloud == 1.7.1
32+
ibm-cos-sdk == 2.3.0
3333
ibmcloudsql == 0.2.13
3434

3535
# Compose Libs
@@ -38,4 +38,4 @@ pymongo == 3.7.1
3838
redis == 2.10.6
3939
pika == 0.12.0
4040
elasticsearch >=5.0.0,<6.0.0
41-
cassandra-driver == 3.14.0
41+
cassandra-driver == 3.15.1

‎python3.7/CHANGELOG.md‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# IBM Functions Python 3.7 Runtime Container
2+
3+
## 1.0.0
4+
Python version:
5+
- [3.7](https://github.com/docker-library/python/blob/master/3.7/stretch/Dockerfile)
6+
7+
Python packages:
8+
- asn1crypto==0.24.0
9+
- attrs==18.2.0
10+
- Automat==0.7.0
11+
- beautifulsoup4==4.6.3
12+
- botocore==1.12.13
13+
- cassandra-driver==3.15.1
14+
- certifi==2018.8.24
15+
- cffi==1.11.5
16+
- chardet==3.0.4
17+
- Click==7.0
18+
- cloudant==2.10.0
19+
- constantly==15.1.0
20+
- cryptography==2.3.1
21+
- cssselect==1.0.3
22+
- docutils==0.14
23+
- elasticsearch==5.5.3
24+
- Flask==1.0.2
25+
- gevent==1.3.6
26+
- greenlet==0.4.15
27+
- httplib2==0.11.3
28+
- hyperlink==18.0.0
29+
- ibm-cos-sdk==2.3.0
30+
- ibm-db==2.0.9
31+
- ibmcloudsql==0.2.13
32+
- idna==2.7
33+
- incremental==17.5.0
34+
- itsdangerous==0.24
35+
- Jinja2==2.10
36+
- jmespath==0.9.3
37+
- kafka-python==1.4.3
38+
- lxml==4.2.5
39+
- MarkupSafe==1.0
40+
- numpy==1.15.2
41+
- pandas==0.23.4
42+
- parsel==1.5.0
43+
- pika==0.12.0
44+
- Pillow==5.2.0
45+
- psycopg2==2.7.5
46+
- pyasn1==0.4.4
47+
- pyasn1-modules==0.2.2
48+
- pycparser==2.19
49+
- PyDispatcher==2.0.5
50+
- PyHamcrest==1.9.0
51+
- pymongo==3.7.1
52+
- pyOpenSSL==18.0.0
53+
- python-dateutil==2.7.3
54+
- pytz==2018.5
55+
- queuelib==1.5.0
56+
- redis==2.10.6
57+
- requests==2.19.1
58+
- scikit-learn==0.20.0
59+
- scipy==1.1.0
60+
- Scrapy==1.5.1
61+
- service-identity==17.0.0
62+
- simplejson==3.16.0
63+
- six==1.11.0
64+
- tornado==4.5.2
65+
- Twisted==18.7.0
66+
- urllib3==1.23
67+
- virtualenv==16.0.0
68+
- w3lib==1.19.0
69+
- watson-developer-cloud==2.1.0
70+
- websocket-client==0.47.0
71+
- Werkzeug==0.14.1
72+
- zope.interface==4.5.0

‎python3.7/Dockerfile‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
FROM python:3.7-slim-stretch
2+
3+
ENV FLASK_PROXY_PORT 8080
4+
5+
RUN apt-get update && apt-get install -y \
6+
gcc \
7+
libc-dev \
8+
libxslt-dev \
9+
libxml2-dev \
10+
libffi-dev \
11+
libssl-dev \
12+
zip \
13+
unzip \
14+
vim \
15+
&& rm -rf /var/lib/apt/lists/*
16+
17+
RUN apt-cache search linux-headers-generic
18+
19+
COPY requirements.txt requirements.txt
20+
21+
RUN pip install --upgrade pip setuptools six && pip install --no-cache-dir -r requirements.txt
22+
23+
# create action working directory
24+
RUN mkdir -p /action
25+
26+
RUN mkdir -p /actionProxy
27+
ADD https://raw.githubusercontent.com/apache/incubator-openwhisk-runtime-docker/8b2e205c39d84ed5ede6b1b08cccf314a2b13105/core/actionProxy/actionproxy.py /actionProxy/actionproxy.py
28+
29+
RUN mkdir -p /pythonAction
30+
ADD https://raw.githubusercontent.com/apache/incubator-openwhisk-runtime-python/3%401.0.3/core/pythonAction/pythonrunner.py /pythonAction/pythonrunner.py
31+
32+
CMD ["/bin/bash", "-c", "cd /pythonAction && python -u pythonrunner.py"]

‎python3.7/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ext.dockerImageName = 'action-python-v3.7'
2+
apply from: '../gradle/docker.gradle'

0 commit comments

Comments
 (0)