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.

Sign up for GitHub

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

Jump to bottom

Revert "Revert "Bump pytest from 5.4.3 to 7.0.1"" #26525

Merged
merged 6 commits into from
Jul 19, 2022
Merged

Revert "Revert "Bump pytest from 5.4.3 to 7.0.1"" #26525

merged 6 commits into from
Jul 19, 2022

Conversation

Riatre
Copy link
Contributor

@Riatre Riatre commented Jul 13, 2022 •
edited
Loading

Why are these changes needed?

See #26334, #26517.

Related issue number

Checks

  • I've run scripts/format.sh to lint the changes in this PR.
  • I've included any doc changes needed for https://docs.ray.io/en/master/.
  • I've made sure the tests are passing. Note that there might be a few flaky tests, see the recent failures at https://flakey-tests.ray.io/
  • Testing Strategy
    • Unit tests
    • Release tests
    • This PR is not tested :(

@Riatre Riatre force-pushed the rfwd-26334 branch 4 times, most recently from 661882a to 8e66bef Compare July 15, 2022 16:04
Riatre added 3 commits July 16, 2022 12:48
@Riatre
Revert "Revert "Bump pytest from 5.4.3 to 7.0.1""
2544ec9 
This reverts commit ab10890.

Signed-off-by: Riatre Foo <foo@riat.re>
@Riatre
Fix missing test data files dependency in rllib/BUILD
b123e53 
See # 26334 and # 26517 for context.

Once this is in, it should be good to roll-forwrad again.

Signed-off-by: Riatre Foo <foo@riat.re>
@Riatre
debug: run all tests
0c5e796 
Signed-off-by: Riatre Foo <foo@riat.re>
@Riatre
Revert "debug: run all tests"
e234f6d 
This reverts commit 0c5e796.

Signed-off-by: Riatre Foo <foo@riat.re>
@Riatre
Copy link
Contributor Author

Riatre commented Jul 16, 2022

Test result with 0c5e796 ("debug: run all tests"): https://buildkite.com/ray-project/ray-builders-pr/builds/38573

Windows failure: #26615

@Riatre Riatre marked this pull request as ready for review July 16, 2022 08:58
scv119
scv119 approved these changes Jul 16, 2022
View reviewed changes
Copy link
Contributor

@scv119 scv119 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

second time is the charm!

@Riatre Riatre changed the title [WIP] Revert "Revert "Bump pytest from 5.4.3 to 7.0.1"" Revert "Revert "Bump pytest from 5.4.3 to 7.0.1"" Jul 16, 2022
@pcmoritz
Copy link
Contributor

fixed a merge conflict that just came up, let's merge it as soon as tests pass again to avoid further conflicts :)

avnishn
avnishn approved these changes Jul 18, 2022
View reviewed changes
Copy link
Member

@avnishn avnishn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If passing the CI lgtm

@pcmoritz
Copy link
Contributor

@Riatre There are some more failures on the CI:

https://buildkite.com/ray-project/ray-builders-pr/builds/38794#01821334-f5ba-469a-a8dc-d16c56b5dc27

FileNotFoundError: /root/.cache/bazel/_bazel_root/5fe90af4e7d1ed9fcf52f59e39e126f5/execroot/com_github_ray_project_ray/bazel-out/k8-opt/bin/python/ray/data/tests/test_dataset_formats.runfiles/com_github_ray_project_ray/python/ray/data/tests/image-folder

https://buildkite.com/ray-project/ray-builders-pr/builds/38794#01821334-f4dc-4eec-9ccd-57da6b936552

FileNotFoundError: [Errno 2] No such file or directory: '/root/.cache/bazel/_bazel_root/5fe90af4e7d1ed9fcf52f59e39e126f5/execroot/com_github_ray_project_ray/bazel-out/k8-opt/bin/rllib/test_dataset_reader.runfiles/com_github_ray_project_ray/rllib/tests/data/pendulum/enormous.zip'

@Riatre
fix new tests since last rebase
66081ba 
Signed-off-by: Riatre Foo <foo@riat.re>
@Riatre
Copy link
Contributor Author

Riatre commented Jul 18, 2022

Pushed a new commit to fix the two tests merged since last rebase (#26458 and #24641).

Windows failure looks unrelated, it segfaults:

Windows fatal exception: access violation

@pcmoritz pcmoritz merged commit 591cd22 into ray-project:master Jul 19, 2022
@jjyao jjyao mentioned this pull request Jul 19, 2022
Merged
6 tasks
jjyao added a commit that referenced this pull request Jul 19, 2022
@jjyao
Fix test tags (#26703)
28d677c 
Some tests tags are accidentally changed in #26525
xwjiang2010 pushed a commit to xwjiang2010/ray that referenced this pull request Jul 19, 2022
@Riatre @xwjiang2010
Revert "Revert "Bump pytest from 5.4.3 to 7.0.1"" (ray-project#26525)
2645462 
* Revert "Revert "Bump pytest from 5.4.3 to 7.0.1""

This reverts commit ab10890.

Signed-off-by: Riatre Foo <foo@riat.re>

* Fix missing test data files dependency in rllib/BUILD

See # 26334 and # 26517 for context.

Once this is in, it should be good to roll-forwrad again.

Signed-off-by: Riatre Foo <foo@riat.re>

* debug: run all tests

Signed-off-by: Riatre Foo <foo@riat.re>

* Revert "debug: run all tests"

This reverts commit 0c5e796.

Signed-off-by: Riatre Foo <foo@riat.re>

* fix new tests since last rebase

Signed-off-by: Riatre Foo <foo@riat.re>
Signed-off-by: Xiaowei Jiang <xwjiang2010@gmail.com>
xwjiang2010 pushed a commit to xwjiang2010/ray that referenced this pull request Jul 19, 2022
@jjyao @xwjiang2010
Fix test tags (ray-project#26703)
889146f 
Some tests tags are accidentally changed in ray-project#26525

Signed-off-by: Xiaowei Jiang <xwjiang2010@gmail.com>
Stefan-1313 pushed a commit to Stefan-1313/ray_mod that referenced this pull request Aug 18, 2022
@Riatre
Revert "Revert "Bump pytest from 5.4.3 to 7.0.1"" (ray-project#26525)
a5118cf 
* Revert "Revert "Bump pytest from 5.4.3 to 7.0.1""

This reverts commit ab10890.

Signed-off-by: Riatre Foo <foo@riat.re>

* Fix missing test data files dependency in rllib/BUILD

See # 26334 and # 26517 for context.

Once this is in, it should be good to roll-forwrad again.

Signed-off-by: Riatre Foo <foo@riat.re>

* debug: run all tests

Signed-off-by: Riatre Foo <foo@riat.re>

* Revert "debug: run all tests"

This reverts commit 0c5e796.

Signed-off-by: Riatre Foo <foo@riat.re>

* fix new tests since last rebase

Signed-off-by: Riatre Foo <foo@riat.re>
Signed-off-by: Stefan van der Kleij <s.vanderkleij@viroteq.com>
Stefan-1313 pushed a commit to Stefan-1313/ray_mod that referenced this pull request Aug 18, 2022
@jjyao
Fix test tags (ray-project#26703)
a771aa4 
Some tests tags are accidentally changed in ray-project#26525

Signed-off-by: Stefan van der Kleij <s.vanderkleij@viroteq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jianoaix jianoaix jianoaix approved these changes

@avnishn avnishn avnishn approved these changes

@jjyao jjyao jjyao approved these changes

@scv119 scv119 scv119 approved these changes

@pcmoritz pcmoritz pcmoritz approved these changes

@ericl ericl ericl approved these changes

@sven1977 sven1977 Awaiting requested review from sven1977 sven1977 is a code owner

@gjoliver gjoliver Awaiting requested review from gjoliver

@ArturNiederfahrenhorst ArturNiederfahrenhorst Awaiting requested review from ArturNiederfahrenhorst

@smorad smorad Awaiting requested review from smorad

@maxpumperla maxpumperla Awaiting requested review from maxpumperla

@kouroshHakha kouroshHakha Awaiting requested review from kouroshHakha

@krfricke krfricke Awaiting requested review from krfricke

@fishbone fishbone Awaiting requested review from fishbone

@stephanie-wang stephanie-wang Awaiting requested review from stephanie-wang stephanie-wang is a code owner

@suquark suquark Awaiting requested review from suquark

@clarkzinzow clarkzinzow Awaiting requested review from clarkzinzow

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Riatre @pcmoritz @ericl @scv119 @jjyao @avnishn @jianoaix