Skip to content

Commit

Permalink
TEST-modin-project#6920: Remove testing for Ray client (modin-project…
Browse files Browse the repository at this point in the history
…#6921)

Signed-off-by: Igoshev, Iaroslav <[email protected]>
  • Loading branch information
YarShev authored Feb 6, 2024
1 parent 2cdb534 commit e55e6a0
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 103 deletions.
66 changes: 0 additions & 66 deletions .github/workflows/push-to-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
2 changes: 0 additions & 2 deletions modin/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
ReadSqlEngine,
StorageFormat,
TestDatasetSize,
TestRayClient,
TestReadFromPostgres,
TestReadFromSqlServer,
TrackFileLeaks,
Expand All @@ -72,7 +71,6 @@
"IsRayCluster",
"RayRedisAddress",
"RayRedisPassword",
"TestRayClient",
"LazyExecution",
# Dask specific
"DaskThreadsPerWorker",
Expand Down
7 changes: 0 additions & 7 deletions modin/config/envvars.py
Original file line number Diff line number Diff line change
Expand Up @@ -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."""

Expand Down
28 changes: 0 additions & 28 deletions modin/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,10 @@ def _saving_make_api_url(token, _make_api_url=modin.utils._make_api_url):
from modin.config import ( # noqa: E402
AsyncReadMode,
BenchmarkMode,
CIAWSAccessKeyID,
CIAWSSecretAccessKey,
GithubCI,
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
Expand Down Expand Up @@ -496,31 +493,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:
Expand Down

0 comments on commit e55e6a0

Please sign in to comment.