google-deepmind / meltingpot

A suite of test scenarios for multi-agent reinforcement learning.
Apache License 2.0
582 stars 118 forks source link

update gym -> gymnasium, ray=2.0.0 -> ray=2.5.0 #153

Closed dimonenka closed 1 year ago

dimonenka commented 1 year ago

Not ideal but hope it still helps.

google-cla[bot] commented 1 year ago

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

jagapiou commented 1 year ago

FYI: got some updates to the requirements landing soon (chex<0.1.81, unpinned tensorflow) and a fix of some of the utils_test.py.

jagapiou commented 1 year ago

self._num_players not self.num_players please.

dimonenka commented 1 year ago

sorry for the bugs, trying to squash now

dimonenka commented 1 year ago

I'm not sure if I can squash:

dimonenka commented 1 year ago

Should I create a new pull request with all commits in one?

jagapiou commented 1 year ago

I think you should be able to do this to squash it all into one commit while keeping this PR:

git tag pr153  # for safety only
git fetch upstream
git reset --soft upstream/main
git commit -m 'update gym -> gymnasium, ray=2.0.0 -> ray=2.5.0'
git push --force
dimonenka commented 1 year ago

Yea I don't know, it didn't work, says there are no changes to commit

jagapiou commented 1 year ago

Ah sorry forgot to specify reset to upstream/main. I've updated the instructions.

dimonenka commented 1 year ago

This is magic, you must be a wizard.

jagapiou commented 1 year ago

Sorry, a few changes that weren't in your branch got reverted we should have merged upstream/main into main before squashing.

Option 1

Manually revert them and then fix and then use

git commit --amend --no-edit
git push --force

Option 2

Assuming you tagged as pr315 as above (hooray for safety tags), I think you can just git reset --hard pr153 to get back to where you were and then try again with:

git fetch upstream
git merge upstream/main  # the thing I forgot
git reset --soft upstream/main
git commit -m 'update gym -> gymnasium, ray=2.0.0 -> ray=2.5.0'
git push --force
dimonenka commented 1 year ago

Yep hard reset worked

dimonenka commented 1 year ago

Automatic tests always failed to install gymnasium -- is that ok?

jagapiou commented 1 year ago

Fantastic, thanks so much.

When I drop the petting zoo stuff from examples/requirements.txt the gymnasium issues went away so I think the automatic tests are failing because of a dependency conflict between pettingzoo and ray. So there's still more work updating these examples. But this has gotten us off to a good start :-)

jagapiou commented 1 year ago

I've trigged our pipeline that pulls this PR to our internal repo, checks it breaks nothing internally, asks someone to LGTM it, and then it will hopefully hit the public repo soon.

dimonenka commented 1 year ago

Cool, thanks! Let me know if something else is needed on my end.

jagapiou commented 1 year ago

Merged in a72757f09ff4c404676b158964abb63938f093a6