Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[python3.10] upgrade pytest to 6.2.4 that supports python3.10 #24828

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ci/build/test-wheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ if [[ "$platform" == "linux" ]]; then
"$PYTHON_EXE" -u -c "import ray; print(ray.__commit__)" | grep "$TRAVIS_COMMIT" || (echo "ray.__commit__ not set properly!" && exit 1)

# Install the dependencies to run the tests.
"$PIP_CMD" install -q aiohttp aiosignal frozenlist grpcio pytest==5.4.3 requests proxy.py
"$PIP_CMD" install -q aiohttp aiosignal frozenlist grpcio pytest==6.2.5 requests proxy.py

# Run a simple test script to make sure that the wheel works.
for SCRIPT in "${TEST_SCRIPTS[@]}"; do
Expand Down Expand Up @@ -117,7 +117,7 @@ elif [[ "$platform" == "macosx" ]]; then
"$PIP_CMD" install -q "$PYTHON_WHEEL"

# Install the dependencies to run the tests.
"$PIP_CMD" install -q aiohttp aiosignal frozenlist grpcio pytest==5.4.3 requests proxy.py
"$PIP_CMD" install -q aiohttp aiosignal frozenlist grpcio pytest==6.2.5 requests proxy.py

# Run a simple test script to make sure that the wheel works.
for SCRIPT in "${TEST_SCRIPTS[@]}"; do
Expand Down
2 changes: 1 addition & 1 deletion ci/env/install-minimal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ eval "${WORKSPACE_DIR}/ci/ci.sh build"

# Install test requirements
python -m pip install -U \
pytest==5.4.3 \
pytest==6.2.5 \
numpy
10 changes: 3 additions & 7 deletions python/ray/tests/BUILD
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
load("//bazel:python.bzl", "py_test_module_list")

SRCS = [] + select({
"@bazel_tools//src/conditions:windows": glob([
# TODO(mehrdadn): This should be added for all platforms once resulting errors are fixed
"**/conftest.py",
]),
"//conditions:default": [],
})
SRCS = glob([
"**/conftest.py",
])

py_test_module_list(
files = [
Expand Down
2 changes: 1 addition & 1 deletion python/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ pexpect
Pillow; platform_system != "Windows"
pygments
pyspark==3.1.2
pytest==5.4.3
pytest==6.2.5
pytest-asyncio==0.16.0
pytest-rerunfailures
pytest-sugar
Expand Down