Skip to content

Commit 5692ca9

Browse files
csantanaprcsantanapr
authored
Update python march7 (ibm-functions#26)
1 parent dc6c8ad commit 5692ca9

File tree

3 files changed

+78
-64
lines changed

3 files changed

+78
-64
lines changed

‎python3/CHANGELOG.md‎

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

33

4+
## 1.3.0
5+
Changes:
6+
- added ibmcloudsql (0.2.5)
7+
- updated cloudant from (2.7.0) to (2.8.1)
8+
- updated ibm-cos-sdk from (2.0.0) to (2.0.2)
9+
- updated kafka_python from (1.3.5) to (1.4.1)
10+
- updated numpy from (1.14.0) to (1.14.1)
11+
12+
Python version:
13+
- [3.6.4](https://github.com/docker-library/python/blob/a1aa406bfd8c7b129e6e0ee0ba972b863624ac0d/3.6/jessie/Dockerfile)
14+
15+
Python packages:
16+
- asn1crypto (0.24.0)
17+
- attrs (17.4.0)
18+
- Automat (0.6.0)
19+
- beautifulsoup4 (4.6.0)
20+
- botocore (1.9.4)
21+
- certifi (2018.1.18)
22+
- cffi (1.11.5)
23+
- chardet (3.0.4)
24+
- click (6.7)
25+
- cloudant (2.8.1)
26+
- constantly (15.1.0)
27+
- cryptography (2.1.4)
28+
- cssselect (1.0.3)
29+
- docutils (0.14)
30+
- Flask (0.12.2)
31+
- gevent (1.2.2)
32+
- greenlet (0.4.13)
33+
- httplib2 (0.10.3)
34+
- hyperlink (18.0.0)
35+
- ibm-cos-sdk (2.0.2)
36+
- ibm-db (2.0.8a0)
37+
- ibmcloudsql (0.2.5)
38+
- idna (2.6)
39+
- incremental (17.5.0)
40+
- itsdangerous (0.24)
41+
- Jinja2 (2.10)
42+
- jmespath (0.9.3)
43+
- kafka-python (1.4.1)
44+
- lxml (4.1.1)
45+
- MarkupSafe (1.0)
46+
- numpy (1.14.1)
47+
- pandas (0.22.0)
48+
- parsel (1.4.0)
49+
- pip (9.0.1)
50+
- pyasn1 (0.4.2)
51+
- pyasn1-modules (0.2.1)
52+
- pycparser (2.18)
53+
- PyDispatcher (2.0.5)
54+
- pyOpenSSL (17.5.0)
55+
- pysolr (3.7.0)
56+
- python-dateutil (2.6.1)
57+
- pytz (2018.3)
58+
- queuelib (1.4.2)
59+
- requests (2.18.4)
60+
- scikit-learn (0.19.1)
61+
- scipy (1.0.0)
62+
- Scrapy (1.5.0)
63+
- service-identity (17.0.0)
64+
- setuptools (38.5.2)
65+
- simplejson (3.13.2)
66+
- six (1.11.0)
67+
- tornado (5.0)
68+
- Twisted (17.9.0)
69+
- urllib3 (1.22)
70+
- virtualenv (15.1.0)
71+
- w3lib (1.19.0)
72+
- watson-developer-cloud (1.0.2)
73+
- Werkzeug (0.14.1)
74+
- wheel (0.30.0)
75+
- zope.interface (4.4.3)
76+
477
## 1.2.0
578
Changes:
679
- added pandas (0.22.0)

‎python3/requirements.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ flask == 0.12.2
77
# default available packages for python3action
88
beautifulsoup4 == 4.6.0
99
httplib2 == 0.10.3
10-
kafka_python == 1.3.5
10+
kafka_python == 1.4.1
1111
lxml == 4.1.1
1212
python-dateutil == 2.6.1
1313
requests == 2.18.4
@@ -17,13 +17,14 @@ virtualenv == 15.1.0
1717
twisted == 17.9.0.
1818

1919
# packages for numerics
20-
numpy == 1.14.0
20+
numpy == 1.14.1
2121
scikit-learn == 0.19.1
2222
scipy == 1.0.0
2323
pandas == 0.22.0
2424

2525
# IBM specific python modules
2626
ibm_db == 2.0.8a
27-
cloudant == 2.7.0
27+
cloudant == 2.8.1
2828
watson-developer-cloud == 1.0.2
29-
ibm-cos-sdk == 2.0.0
29+
ibm-cos-sdk == 2.0.2
30+
ibmcloudsql == 0.2.5

‎tests/src/test/scala/actionContainers/IBMPythonActionContainerTests.scala‎

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -197,66 +197,6 @@ class IBMPythonActionContainerTests extends BasicActionRunnerTests with WskActor
197197
})
198198
}
199199

200-
/*
201-
FIXME: virtualenv not working
202-
203-
it should "run zipped Python action containing a virtual environment with non-standard entry point" in {
204-
val zippedPythonAction = if (imageName == "python2action") "python2_virtualenv.zip" else "python3_virtualenv.zip"
205-
val zippedPythonActionName = TestUtils.getTestActionFilename(zippedPythonAction)
206-
val code = readAsBase64(Paths.get(zippedPythonActionName))
207-
208-
val (out, err) = withActionContainer() { c =>
209-
val (initCode, initRes) = c.init(initPayload(code, main = "naim"))
210-
initCode should be(200)
211-
val args = JsObject("msg" -> JsString("any"))
212-
val (runCode, runRes) = c.run(runPayload(args))
213-
runCode should be(200)
214-
runRes.get.toString() should include("netmask")
215-
}
216-
checkStreams(out, err, {
217-
case (o, e) =>
218-
o should include("netmask")
219-
e shouldBe empty
220-
})
221-
}
222-
223-
it should "report error if zipped Python action containing a virtual environment for wrong python version" in {
224-
val zippedPythonAction = if (imageName == "python3action") "python2_virtualenv.zip" else "python3_virtualenv.zip"
225-
val zippedPythonActionName = TestUtils.getTestActionFilename(zippedPythonAction)
226-
val code = readAsBase64(Paths.get(zippedPythonActionName))
227-
228-
val (out, err) = withActionContainer() { c =>
229-
val (initCode, initRes) = c.init(initPayload(code, main = "main"))
230-
initCode should be(200)
231-
val args = JsObject("msg" -> JsString("any"))
232-
val (runCode, runRes) = c.run(runPayload(args))
233-
runCode should be(502)
234-
}
235-
checkStreams(out, err, {
236-
case (o, e) =>
237-
o shouldBe empty
238-
if (imageName == "python2action") { e should include("ImportError") }
239-
if (imageName == "python3action") { e should include("ModuleNotFoundError") }
240-
})
241-
}
242-
*/
243-
244-
it should "report error if zipped Python action has wrong main module name" in {
245-
val zippedPythonActionWrongName = TestUtils.getTestActionFilename("python_virtualenv_name.zip")
246-
247-
val code = readAsBase64(Paths.get(zippedPythonActionWrongName))
248-
249-
val (out, err) = withActionContainer() { c =>
250-
val (initCode, initRes) = c.init(initPayload(code, main = "main"))
251-
initCode should be(502)
252-
}
253-
checkStreams(out, err, {
254-
case (o, e) =>
255-
o shouldBe empty
256-
e should include("Zip file does not include __main__.py")
257-
})
258-
}
259-
260200
it should "report error if zipped Python action has invalid virtualenv directory" in {
261201
val zippedPythonActionWrongDir = TestUtils.getTestActionFilename("python_virtualenv_dir.zip")
262202

0 commit comments

Comments
 (0)