Merge 53dbf7a into e218b21

.github/workflows/test-all.yml

@@ -15,20 +15,17 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9, '3.10']
         EXTRA: [false]  # used to force includes to get included
         include:
-          - python-version: 3.6
+          - python-version: 3.7
             os: ubuntu-latest
             # make sure that the most verbose level is not crashy
             VERBOSE: verbose  # does work
             PARAMSURVEY_VERBOSE: 3
             PYTEST_STDERR_VISIBLE: -s
             EXTRA: true
           - python-version: '3.10'
-            os: ubuntu-latest
-            ONLY_BUILTINS: 1  # no ray wheel yet on 3.10
-          - python-version: 3.9
             os: macos-latest
             ONLY_BUILTINS: 1  # no ray on macos py38, but there is for py39
 

CHANGELOG.md

@@ -1,3 +1,7 @@
+- 0.4.18 (not yet tagged)
+	+ support python 3.10, thanks to a ray wheel ray>=1.13
+	+ drop python 3.6, due to setuptools_scm dropping it
+
 - 0.4.17
 	+ scripts/paramsurvey-cli.py had a bug and was failing yet passing crash-only-testing
 	+ make sure scripts/*.py fails testing if fail

setup.py

@@ -69,11 +69,11 @@
         'License :: OSI Approved :: Apache Software License',
         'Programming Language :: Python',
         #'Programming Language :: Python :: 3.5',  # ray no longer supports py3.5, also setuptools_scm problem
-        'Programming Language :: Python :: 3.6',
+        #'Programming Language :: Python :: 3.6',  # setuptools_scm dropped in v7
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
-        #'Programming Language :: Python :: 3.10',  # awaiting a ray wheel, https://github.com/ray-project/ray/issues/19116
+        'Programming Language :: Python :: 3.10',  # ray wheel in ray >= 1.13, https://github.com/ray-project/ray/issues/19116
         'Programming Language :: Python :: 3 :: Only',
     ],
 )

test/integration/test-ray.sh

@@ -11,14 +11,23 @@ if [ ! -z "$ONLY_BUILTINS" ]; then
     exit 0
 fi
 
-PORT=6379
+# ray 1.13 introduced the following:
+ray disable-usage-stats || /bin/true
+
+RPORT=6379
+OPORT=8076
+
 REDIS_PASSWORD=thehfhghedhdjfhgfhdhdhdf
-echo $(hostname):$PORT $REDIS_PASSWORD > ~/.ray-test-72363726-details
+# should this be RPORT or OPORT?
+# RPORT works with ray 1.15
+echo $(hostname):$RPORT $REDIS_PASSWORD > ~/.ray-test-72363726-details
 
 GIGABYTE=1000000000  # close enough
 
 ray stop  # in case there's an a leftover ray
-ray start --head --port=$PORT --redis-password=$REDIS_PASSWORD --memory $GIGABYTE --object-store-memory $GIGABYTE --redis-max-memory $GIGABYTE $RAY_START_EXTRAS
+
+# --include-dashboard starts at ray 1.13
+ray start --head --port=$RPORT --object-manager-port=$OPORT --redis-password=$REDIS_PASSWORD --memory $GIGABYTE --object-store-memory $GIGABYTE --redis-max-memory $GIGABYTE $RAY_START_EXTRAS
 
 # in order to find both the uninstalled paramsurvey and our test program,
 # which ray needs to pickle, the PYTHONPATH must be manipulated. See

test/integration/test_generic.py

@@ -307,14 +307,14 @@ def test_map_ncores(paramsurvey_init):
 
 @pytest.mark.skip(reason='cannot call paramsurvey.init twice in a session')
 def test_invalid_kwarg_init():
-    with pytest.raises(TypeError):
+    with pytest.raises((TypeError, ValueError)):  # ValueError in ray >= 1.15.0
         paramsurvey.init(doesnotexist=True)
 
 
 def test_invalid_kwarg(paramsurvey_init):
-    with pytest.raises(TypeError):
+    with pytest.raises((TypeError, ValueError)):  # ValueError in ray >= 1.15.0
         paramsurvey.map(sleep_worker, [{}], doesnotexist=True)
-    with pytest.raises(TypeError):
+    with pytest.raises((TypeError, ValueError)):  # ValueError in ray >= 1.15.0
         paramsurvey.map(sleep_worker, [{}], ray={'doesnotexist': True}, multiprocessing={'doesnotexist': True})
 
 
@@ -401,5 +401,5 @@ def test_pset_backend_args():
     assert next(results.itertuples()).r == 'PASS', 'worker saw ray backend pset config'
 
     psets = [{'foo': 1, 'ray': {'thisoptiondoesnotexist': 1}}]
-    with pytest.raises(TypeError):
+    with pytest.raises((TypeError, ValueError)):  # ValueError ray >= 1.15.0
         results = paramsurvey.map(worker_pset_backend_args, psets, name='test_pset_backend_args')