update python april9 and refactor tests from user.dir

eweiter · eweiter · commit 5828e4a68ca7 · 2018-04-11T14:03:17.000-04:00
diff --git a/python3/CHANGELOG.md b/python3/CHANGELOG.md
@@ -1,5 +1,90 @@
 # IBM Functions Python 3 Runtime Container
 
+## 1.4.0
+Changes:
+- update Python Runtime from 3.6.4 to 3.6.5
+- updated httplib2 from 0.10.3 to 0.11.3
+- updated kafka_python from 1.4.1 to 1.4.2
+- updated lxml from 4.1.1 to 4.2.1
+- updated python-dateutil from 2.6.1 to 2.7.2
+- updated virtualenv from 15.1.0 to 15.2.0
+- updated numpy from 1.14.1 to 1.14.2
+- updated scipy from 1.0.0 to 1.0.1
+- updated watson-developer-cloud from 1.0.2 to 1.3.0
+- updated ibm-cos-sdk from 2.0.2 to 2.1.0
+- updated ibmcloudsql from 0.2.5 to 0.2.13
+
+Python version:
+- [3.6.5](https://github.com/docker-library/python/blob/a1aa406bfd8c7b129e6e0ee0ba972b863624ac0d/3.6/jessie/Dockerfile)
+
+Python packages:
+- asn1crypto (0.24.0)
+- attrs (17.4.0)
+- autobahn (18.4.1)
+- Automat (0.6.0)
+- beautifulsoup4 (4.6.0)
+- botocore (1.10.4)
+- cassandra-driver (3.13.0)
+- certifi (2018.1.18)
+- cffi (1.11.5)
+- chardet (3.0.4)
+- click (6.7)
+- cloudant (2.8.1)
+- constantly (15.1.0)
+- cryptography (2.2.2)
+- cssselect (1.0.3)
+- docutils (0.14)
+- elasticsearch (5.5.2)
+- Flask (0.12.2)
+- gevent (1.2.2)
+- greenlet (0.4.13)
+- httplib2 (0.11.3)
+- hyperlink (18.0.0)
+- ibm-cos-sdk (2.1.0)
+- ibm-db (2.0.8a0)
+- ibmcloudsql (0.2.13)
+- idna (2.6)
+- incremental (17.5.0)
+- itsdangerous (0.24)
+- Jinja2 (2.10)
+- jmespath (0.9.3)
+- kafka-python (1.4.2)
+- lxml (4.2.1)
+- MarkupSafe (1.0)
+- numpy (1.14.2)
+- pandas (0.22.0)
+- parsel (1.4.0)
+- pika (0.11.2)
+- psycopg2 (2.7.4)
+- pyasn1 (0.4.2)
+- pyasn1-modules (0.2.1)
+- pycparser (2.18)
+- PyDispatcher (2.0.5)
+- pymongo (3.6.1)
+- pyOpenSSL (17.5.0)
+- pysolr (3.7.0)
+- python-dateutil (2.7.2)
+- pytz (2018.4)
+- queuelib (1.5.0)
+- redis (2.10.6)
+- requests (2.18.4)
+- scikit-learn (0.19.1)
+- scipy (1.0.1)
+- Scrapy (1.5.0)
+- service-identity (17.0.0)
+- simplejson (3.13.2)
+- six (1.11.0)
+- tornado (4.5.2)
+- Twisted (17.9.0)
+- txaio (2.10.0)
+- urllib3 (1.22)
+- virtualenv (15.2.0)
+- w3lib (1.19.0)
+- watson-developer-cloud (1.3.0)
+- Werkzeug (0.14.1)
+- wheel (0.30.0)
+- zope.interface (4.4.3)
+
 
 ## 1.3.0
 Changes:
diff --git a/python3/requirements.txt b/python3/requirements.txt
@@ -6,28 +6,28 @@ flask == 0.12.2
 
 # default available packages for python3action
 beautifulsoup4 == 4.6.0
-httplib2 == 0.10.3
-kafka_python == 1.4.1
-lxml == 4.1.1
-python-dateutil == 2.6.1
+httplib2 == 0.11.3
+kafka_python == 1.4.2
+lxml == 4.2.1
+python-dateutil == 2.7.2
 requests == 2.18.4
 scrapy == 1.5.0
 simplejson == 3.13.2
-virtualenv == 15.1.0
+virtualenv == 15.2.0
 twisted == 17.9.0.
 
 # packages for numerics
-numpy == 1.14.1
+numpy == 1.14.2
 scikit-learn == 0.19.1
-scipy == 1.0.0
+scipy == 1.0.1
 pandas == 0.22.0
 
 # IBM specific python modules
 ibm_db == 2.0.8a
 cloudant == 2.8.1
-watson-developer-cloud == 1.0.2
-ibm-cos-sdk == 2.0.2
-ibmcloudsql == 0.2.5
+watson-developer-cloud == 1.3.0
+ibm-cos-sdk == 2.1.0
+ibmcloudsql == 0.2.13
 
 # Compose Libs
 psycopg2 == 2.7.4
diff --git a/tests/dat/watson/testWatsonSDK.py b/tests/dat/watson/testWatsonSDK.py
@@ -3,7 +3,7 @@
 from watson_developer_cloud import DiscoveryV1
 
 def main(dict):
-    return {"message": DiscoveryV1.VERSION_DATE_2017_11_07}
+    return {"message": DiscoveryV1.default_url}
 
 if __name__ == "__main__":
     # execute only if run as a script
diff --git a/tests/src/test/scala/actionContainers/IBMPythonActionCOSTests.scala b/tests/src/test/scala/actionContainers/IBMPythonActionCOSTests.scala
@@ -30,7 +30,7 @@ class IBMPythonActionCOSTests extends TestHelpers with WskTestHelpers {
   implicit val wskprops: WskProps = WskProps()
   var defaultKind = Some("python-jessie:3")
   val wsk = new WskRest
-  val datdir = System.getProperty("user.dir") + "/dat/cos/"
+  val datdir = "tests/dat/cos/"
   val actionName = "testCOSSDK"
   val actionFileName = "testCOSSDK.py"
 
diff --git a/tests/src/test/scala/actionContainers/IBMPythonActionCloudantTests.scala b/tests/src/test/scala/actionContainers/IBMPythonActionCloudantTests.scala
@@ -30,7 +30,7 @@ class IBMPythonActionCloudantTests extends TestHelpers with WskTestHelpers {
   implicit val wskprops: WskProps = WskProps()
   var defaultKind = Some("python-jessie:3")
   val wsk = new WskRest
-  val datdir = System.getProperty("user.dir") + "/dat/cloudant/"
+  val datdir = "tests/dat/cloudant/"
   val actionName = "testCloudantSDK"
   val actionFileName = "testCloudantSDK.py"
 
diff --git a/tests/src/test/scala/actionContainers/IBMPythonActionDB2Tests.scala b/tests/src/test/scala/actionContainers/IBMPythonActionDB2Tests.scala
@@ -32,8 +32,7 @@ class IBMPythonActionDB2Tests extends TestHelpers with WskTestHelpers with Befor
   implicit val wskprops: WskProps = WskProps()
   var defaultKind = Some("python-jessie:3")
   val wsk = new WskRest
-  val userdir = System.getProperty("user.dir")
-  val db2dir = userdir + "/dat/db2/"
+  val db2dir = "tests/dat/db2/"
   val db2containerName = "db2test"
 
   it should "test DB2 using local db2 container with python action" in withAssetCleaner(wskprops) { (wp, assetHelper) =>
diff --git a/tests/src/test/scala/actionContainers/IBMPythonActionWatsonTests.scala b/tests/src/test/scala/actionContainers/IBMPythonActionWatsonTests.scala
@@ -31,7 +31,7 @@ class IBMPythonActionWatsonTests extends TestHelpers with WskTestHelpers {
   implicit val wskprops: WskProps = WskProps()
   var defaultKind = Some("python-jessie:3")
   val wsk = new WskRest
-  val datdir = System.getProperty("user.dir") + "/dat/watson/"
+  val datdir = "tests/dat/watson/"
   val actionName = "testWatsonSDK"
   val actionFileName = "testWatsonSDK.py"
 
@@ -57,9 +57,9 @@ class IBMPythonActionWatsonTests extends TestHelpers with WskTestHelpers {
       withActivation(wsk.activation, wsk.action.invoke(actionName)) { activation =>
         val response = activation.response
         response.result.get.fields.get("error") shouldBe empty
-        response.result.get.fields.get("message") should be(Some(JsString("2017-11-07")))
+        response.result.get.fields.get("message") should equal(
+          Some(JsString("https://gateway.watsonplatform.net/discovery/api")))
       }
 
   }
-
 }
diff --git a/tests/src/test/scala/integration/CredentialsIBMPythonCOSTests.scala b/tests/src/test/scala/integration/CredentialsIBMPythonCOSTests.scala
@@ -29,7 +29,7 @@ class CredentialsIBMPythonCOSTests extends TestHelpers with WskTestHelpers with
   implicit val wskprops: WskProps = WskProps()
   var defaultKind = Some("python-jessie:3")
   val wsk = new WskRest
-  val datdir = System.getProperty("user.dir") + "/dat/cos"
+  val datdir = "tests/dat/cos"
   val actionName = "testCOSService"
   val actionFileName = "testCOSService.py"
   val creds = TestUtils.getVCAPcredentials("cloud-object-storage")
diff --git a/tests/src/test/scala/integration/CredentialsIBMPythonCloudantTests.scala b/tests/src/test/scala/integration/CredentialsIBMPythonCloudantTests.scala
@@ -31,7 +31,7 @@ class CredentialsIBMPythonCloudantTests extends TestHelpers with WskTestHelpers
   implicit val wskprops: WskProps = WskProps()
   var defaultKind = Some("python-jessie:3")
   val wsk = new WskRest
-  val datdir = System.getProperty("user.dir") + "/dat/cloudant/"
+  val datdir = "tests/dat/cloudant/"
   var creds = TestUtils.getVCAPcredentials("cloudantNoSQLDB")
   val actionName = "testCloudantService"
   val actionFileName = "testCloudantService.py"
diff --git a/tests/src/test/scala/integration/CredentialsIBMPythonDb2CloudTests.scala b/tests/src/test/scala/integration/CredentialsIBMPythonDb2CloudTests.scala
@@ -28,7 +28,7 @@ class CredentialsIBMPythonDb2CloudTests extends TestHelpers with WskTestHelpers
   implicit val wskprops: WskProps = WskProps()
   val defaultKind = Some("python-jessie:3")
   val wsk = new WskRest
-  val datdir = System.getProperty("user.dir") + "/dat/db2"
+  val datdir = "tests/dat/db2"
   val actionName = "testDB2Service"
   val actionFileName = "testDB2Service.py"
 
diff --git a/tests/src/test/scala/integration/CredentialsIBMPythonWatsonTests.scala b/tests/src/test/scala/integration/CredentialsIBMPythonWatsonTests.scala
@@ -28,7 +28,7 @@ class CredentialsIBMPythonWatsonTests extends TestHelpers with WskTestHelpers {
   implicit val wskprops: WskProps = WskProps()
   var defaultKind = Some("python-jessie:3")
   val wsk = new WskRest
-  val datdir = System.getProperty("user.dir") + "/dat/watson"
+  val datdir = "tests/dat/watson"
   val actionName = "testWatsonService"
   val actionFileName = "testWatsonService.py"
 
diff --git a/tests/src/test/scala/system/basic/WskBasicIBMPythonTests.scala b/tests/src/test/scala/system/basic/WskBasicIBMPythonTests.scala
@@ -116,7 +116,7 @@ class WskBasicIBMPythonTests extends TestHelpers with WskTestHelpers with Matche
   behavior of "Python virtualenv"
 
   it should s"invoke a zipped $kind action with virtualenv package" in withAssetCleaner(wskprops) { (wp, assetHelper) =>
-    val userdir = System.getProperty("user.dir") + "/dat/actions/p3zip"
+    val userdir = "tests/dat/actions/p3zip"
     val filename = "python3_jessie_virtualenv.zip"
     val name = filename
     val zippedPythonAction = Some(new File(userdir, filename).toString())
diff --git a/tests/tests/dat b/tests/tests/dat
@@ -0,0 +1 @@
+../dat

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class IBMPythonActionWatsonTests extends TestHelpers with WskTestHelpers {`
`31`	`31`	`implicit val wskprops: WskProps = WskProps()`
`32`	`32`	`var defaultKind = Some("python-jessie:3")`
`33`	`33`	`val wsk = new WskRest`
`34`		`- val datdir = System.getProperty("user.dir") + "/dat/watson/"`
	`34`	`+ val datdir = "tests/dat/watson/"`
`35`	`35`	`val actionName = "testWatsonSDK"`
`36`	`36`	`val actionFileName = "testWatsonSDK.py"`
`37`	`37`
`@@ -57,9 +57,9 @@ class IBMPythonActionWatsonTests extends TestHelpers with WskTestHelpers {`
`57`	`57`	`withActivation(wsk.activation, wsk.action.invoke(actionName)) { activation =>`
`58`	`58`	`val response = activation.response`
`59`	`59`	`response.result.get.fields.get("error") shouldBe empty`
`60`		`- response.result.get.fields.get("message") should be(Some(JsString("2017-11-07")))`
	`60`	`+ response.result.get.fields.get("message") should equal(`
	`61`	`+ Some(JsString("https://gateway.watsonplatform.net/discovery/api")))`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`}`
`64`		`-`
`65`	`65`	`}`