This is an automated email from the ASF dual-hosted git repository.
nchung pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
The following commit(s) were added to refs/heads/master by this push:
new ac7bc72 SDAP-154: Python 3 (#122)
ac7bc72 is described below
commit ac7bc724a068920f8326a9c27ddc64a87340e42a
Author: Stepheny Perez <[email protected]>
AuthorDate: Fri Feb 19 15:33:48 2021 -0800
SDAP-154: Python 3 (#122)
* Code fixes after Python3 upgrade
* Upgraded cassandra and pysolr to work with Python 3.8. Upgraded project
webapp version to 0.4.0
---
analysis/webservice/algorithms_spark/HofMoellerSpark.py | 2 +-
analysis/webservice/webapp_livy.py | 2 +-
data-access/requirements.txt | 4 ++--
helm/values.yaml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/analysis/webservice/algorithms_spark/HofMoellerSpark.py
b/analysis/webservice/algorithms_spark/HofMoellerSpark.py
index e35a6ab..b26a009 100644
--- a/analysis/webservice/algorithms_spark/HofMoellerSpark.py
+++ b/analysis/webservice/algorithms_spark/HofMoellerSpark.py
@@ -324,7 +324,7 @@ def spark_driver(sc, latlon, tile_service_factory,
nexus_tiles_spark, metrics_ca
# Convert the tuples to dictionary entries and combine coordinates
# with the same time stamp. Here we have input key = (time)
- results = list(results.values()).combineByKey(create_combiner,
merge_value, merge_combiner).values().collect()
+ results = results.values().combineByKey(create_combiner, merge_value,
merge_combiner).values().collect()
reduce_duration = (datetime.now() - reduce_start).total_seconds()
metrics_callback(reduce=reduce_duration)
diff --git a/analysis/webservice/webapp_livy.py
b/analysis/webservice/webapp_livy.py
index 009a45c..73d277d 100644
--- a/analysis/webservice/webapp_livy.py
+++ b/analysis/webservice/webapp_livy.py
@@ -19,7 +19,7 @@ import logging
import sys
import os
import pkg_resources
-from . import nexus_tornado.web
+from webservice import nexus_tornado
from .nexus_tornado.options import define, options, parse_command_line
from webservice.NexusLivyHandler import LivyHandler
diff --git a/data-access/requirements.txt b/data-access/requirements.txt
index 5e0f9bc..d676c36 100644
--- a/data-access/requirements.txt
+++ b/data-access/requirements.txt
@@ -1,5 +1,5 @@
-cassandra-driver==3.5.0
-pysolr==3.7.0
+cassandra-driver==3.24.0
+pysolr==3.9.0
requests
nexusproto
Shapely
\ No newline at end of file
diff --git a/helm/values.yaml b/helm/values.yaml
index fdbcd53..aba22e6 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -6,7 +6,7 @@ rootWebpage:
webapp:
enabled: true
distributed:
- image: nexusjpl/nexus-webapp:distributed.0.3.0
+ image: nexusjpl/nexus-webapp:distributed.0.4.0
## Use any of the driver configuration options available at
##
https://github.com/GoogleCloudPlatform/spark-on-k8s-operator/blob/master/docs/user-guide.md
