From 16bb19e6474e1d69a68bf9ba4f308bb747514a19 Mon Sep 17 00:00:00 2001 From: "Igoshev, Iaroslav" Date: Tue, 6 Feb 2024 16:20:48 +0000 Subject: [PATCH] TEST-#6920: Remove testing for Ray client Signed-off-by: Igoshev, Iaroslav --- .github/workflows/push-to-master.yml | 66 ---------------------------- modin/config/__init__.py | 2 - modin/config/envvars.py | 7 --- modin/conftest.py | 26 ----------- 4 files changed, 101 deletions(-) diff --git a/.github/workflows/push-to-master.yml b/.github/workflows/push-to-master.yml index 377849e6d2f..35e41bcec81 100644 --- a/.github/workflows/push-to-master.yml +++ b/.github/workflows/push-to-master.yml @@ -83,69 +83,3 @@ jobs: - run: sudo apt update && sudo apt install -y libhdf5-dev - name: Docstring URL validity check run: python -m pytest modin/test/test_docstring_urls.py - - test-ray-client: - runs-on: ubuntu-latest - defaults: - run: - shell: bash -l {0} - services: - moto: - image: motoserver/moto - ports: - - 5000:5000 - env: - AWS_ACCESS_KEY_ID: foobar_key - AWS_SECRET_ACCESS_KEY: foobar_secret - strategy: - matrix: - python-version: ["3.9"] - test-task: - - modin/pandas/test/dataframe/test_binary.py - - modin/pandas/test/dataframe/test_default.py - - modin/pandas/test/dataframe/test_indexing.py - - modin/pandas/test/dataframe/test_iter.py - - modin/pandas/test/dataframe/test_join_sort.py - - modin/pandas/test/dataframe/test_map_metadata.py - - modin/pandas/test/dataframe/test_reduce.py - - modin/pandas/test/dataframe/test_udf.py - - modin/pandas/test/dataframe/test_window.py - - modin/pandas/test/dataframe/test_pickle.py - - modin/pandas/test/test_series.py - - modin/numpy/test/test_array.py - - modin/numpy/test/test_array_creation.py - - modin/numpy/test/test_array_arithmetic.py - - modin/numpy/test/test_array_axis_functions.py - - modin/numpy/test/test_array_logic.py - - modin/numpy/test/test_array_linalg.py - - modin/numpy/test/test_array_indexing.py - - modin/numpy/test/test_array_math.py - - modin/numpy/test/test_array_shaping.py - - modin/pandas/test/test_rolling.py - - modin/pandas/test/test_expanding.py - - modin/pandas/test/test_concat.py - - modin/pandas/test/test_groupby.py - - modin/pandas/test/test_reshape.py - - modin/pandas/test/test_general.py - - modin/pandas/test/test_io.py - env: - MODIN_ENGINE: ray - MODIN_MEMORY: 1000000000 - MODIN_TEST_RAY_CLIENT: "True" - name: "test-ray-client" - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 1 - - uses: conda-incubator/setup-miniconda@v2 - with: - activate-environment: modin - python-version: ${{matrix.python-version}} - channel-priority: strict - # we set use-only-tar-bz2 to false in order for conda to properly find new packages to be installed - # for more info see https://github.com/conda-incubator/setup-miniconda/issues/264 - use-only-tar-bz2: false - - run: pip install -r requirements-dev.txt - - name: Install HDF5 - run: sudo apt update && sudo apt install -y libhdf5-dev - - run: python -m pytest ${{matrix.test-task}} diff --git a/modin/config/__init__.py b/modin/config/__init__.py index 26d759324fd..19ff9540082 100644 --- a/modin/config/__init__.py +++ b/modin/config/__init__.py @@ -49,7 +49,6 @@ ReadSqlEngine, StorageFormat, TestDatasetSize, - TestRayClient, TestReadFromPostgres, TestReadFromSqlServer, TrackFileLeaks, @@ -71,7 +70,6 @@ "IsRayCluster", "RayRedisAddress", "RayRedisPassword", - "TestRayClient", "LazyExecution", # Partitioning "NPartitions", diff --git a/modin/config/envvars.py b/modin/config/envvars.py index c865e07a358..65e9d0d4880 100644 --- a/modin/config/envvars.py +++ b/modin/config/envvars.py @@ -390,13 +390,6 @@ class TestDatasetSize(EnvironmentVariable, type=str): choices = ("Small", "Normal", "Big") -class TestRayClient(EnvironmentVariable, type=bool): - """Set to true to start and connect Ray client before a testing session starts.""" - - varname = "MODIN_TEST_RAY_CLIENT" - default = False - - class TrackFileLeaks(EnvironmentVariable, type=bool): """Whether to track for open file handles leakage during testing.""" diff --git a/modin/conftest.py b/modin/conftest.py index 392be2d5146..129ba076a54 100644 --- a/modin/conftest.py +++ b/modin/conftest.py @@ -63,7 +63,6 @@ def _saving_make_api_url(token, _make_api_url=modin.utils._make_api_url): IsExperimental, MinPartitionSize, NPartitions, - TestRayClient, ) from modin.core.execution.dispatching.factories import factories # noqa: E402 from modin.core.execution.python.implementations.pandas_on_python.io import ( # noqa: E402 @@ -496,31 +495,6 @@ def set_min_partition_size(request): ray_client_server = None -def pytest_sessionstart(session): - if TestRayClient.get(): - import ray - import ray.util.client.server.server as ray_server - - addr = "localhost:50051" - global ray_client_server - ray_client_server = ray_server.serve(addr) - env_vars = { - "AWS_ACCESS_KEY_ID": CIAWSAccessKeyID.get(), - "AWS_SECRET_ACCESS_KEY": CIAWSSecretAccessKey.get(), - } - extra_init_kw = {"runtime_env": {"env_vars": env_vars}} - ray.util.connect(addr, ray_init_kwargs=extra_init_kw) - - -def pytest_sessionfinish(session, exitstatus): - if TestRayClient.get(): - import ray - - ray.util.disconnect() - if ray_client_server: - ray_client_server.stop(0) - - @pytest.fixture def s3_storage_options(worker_id): # # copied from pandas conftest.py: