From 92bbb662f27d3be3396cc082757cc48548467453 Mon Sep 17 00:00:00 2001
From: Greg Lindahl <lindahl@pbm.com>
Date: Tue, 10 Nov 2020 12:05:14 -0800
Subject: [PATCH] new ray 1.0 interface

---
 paramsurvey/psray.py         | 2 +-
 setup.py                     | 2 +-
 test/integration/test-ray.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/paramsurvey/psray.py b/paramsurvey/psray.py
index c685108..dad1b9d 100644
--- a/paramsurvey/psray.py
+++ b/paramsurvey/psray.py
@@ -39,7 +39,7 @@ def init(system_kwargs, ncores=None, **kwargs):
     # should allow these to be kwargs
     address, password = read_ray_config()
     kwargs['address'] = address
-    kwargs['redis_password'] = password
+    kwargs['_redis_password'] = password  # added the leading _ in ray 1.0.0
 
     if os.environ.get('RAY_LOCAL_MODE', False):
         kwargs['local_mode'] = True
diff --git a/setup.py b/setup.py
index 607e904..4798078 100755
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
 ]
 
 extras_require = {
-    'ray': ['ray', 'pyarrow'],
+    'ray': ['ray>=1', 'pyarrow'],
     'mpi': ['mpi4py'],
     'test': test_requirements,  # setup no longer tests, so make them an extra that .travis.yml uses
 }
diff --git a/test/integration/test-ray.sh b/test/integration/test-ray.sh
index 92f94e1..f14752f 100755
--- a/test/integration/test-ray.sh
+++ b/test/integration/test-ray.sh
@@ -15,7 +15,7 @@ echo $(hostname):$PORT $REDIS_PASSWORD > ~/.ray-test-72363726-details
 
 GIGABYTE=1000000000  # close enough
 
-ray start --head --redis-port=$PORT --redis-password=$REDIS_PASSWORD --memory $GIGABYTE --object-store-memory $GIGABYTE --redis-max-memory $GIGABYTE
+ray start --head --port=$PORT --redis-password=$REDIS_PASSWORD --memory $GIGABYTE --object-store-memory $GIGABYTE --redis-max-memory $GIGABYTE
 
 # in order to find both the uninstalled paramsurvey and our test program,
 # which ray needs to pickle, the PYTHONPATH must be manipulated. See