From 08f0d37db953da7a5887f7ec7ab267148f6938d5 Mon Sep 17 00:00:00 2001 From: guillemdb Date: Mon, 2 Sep 2024 23:35:43 +0200 Subject: [PATCH] Update requirements to avoi git repositories Signed-off-by: guillemdb --- .gitignore | 1 + pyproject.toml | 7 +++---- requirements-dev.lock | 31 +++++++++++++------------------ requirements.lock | 31 +++++++++++++------------------ src/plangym/api_tests.py | 2 +- 5 files changed, 31 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index c6a5811..3f67a48 100644 --- a/.gitignore +++ b/.gitignore @@ -61,6 +61,7 @@ htmlcov/ .cache nosetests.xml coverage.xml +coverage_parallel.xml *.cover .hypothesis/ diff --git a/pyproject.toml b/pyproject.toml index 48aa8b5..65e5526 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,10 +33,9 @@ dependencies = [ [project.optional-dependencies] atari = ["ale-py", "gymnasium[accept-rom-license,atari]>=0.29.1, == 0.*"] nes = [ - # "gym[accept-rom-license] @ git+https://github.com/FragileTech/gym.git", "fragile-gym[accept-rom-license]", - "nes-py @ git+https://github.com/FragileTech/nes-py", # Requires clang, build-essential - "gym-super-mario-bros==7.3.2", + "fragile-nes-py>=10.0.1", # Requires clang, build-essential + "fragile-gym-super-mario-bros", ] classic-control = ["gymnasium[classic_control]>=0.29.1, == 0.*", "pygame>=2.6.0"] ray = ["ray>=2.35.0"] @@ -86,7 +85,7 @@ path = "src/plangym/version.py" [tool.rye] dev-dependencies = ["ruff"] -excluded-dependencies = ["gym"] +#excluded-dependencies = ["gym"] universal = true [tool.rye.scripts] diff --git a/requirements-dev.lock b/requirements-dev.lock index e845d59..f0cf65f 100644 --- a/requirements-dev.lock +++ b/requirements-dev.lock @@ -79,7 +79,6 @@ click==8.1.7 # via ray cloudpickle==3.0.0 # via fragile-gym - # via gym # via gymnasium colorama==0.4.6 ; sys_platform == 'win32' or platform_system == 'Windows' # via click @@ -122,7 +121,7 @@ exceptiongroup==1.2.2 ; python_full_version < '3.11' # via pytest execnet==2.1.1 # via pytest-xdist -executing==2.0.1 +executing==2.1.0 # via stack-data farama-notifications==0.0.4 # via gymnasium @@ -134,7 +133,12 @@ flogging==0.0.22 # via plangym fqdn==1.5.1 # via jsonschema -fragile-gym==1.21.0 +fragile-gym==1.21.1 + # via fragile-nes-py + # via plangym +fragile-gym-super-mario-bros==7.4.0 + # via plangym +fragile-nes-py==10.0.1 # via plangym frozenlist==1.4.1 # via aiosignal @@ -146,12 +150,6 @@ glfw==2.7.0 # via mujoco greenlet==3.0.3 ; (python_full_version < '3.13' and platform_machine == 'AMD64') or (python_full_version < '3.13' and platform_machine == 'WIN32') or (python_full_version < '3.13' and platform_machine == 'aarch64') or (python_full_version < '3.13' and platform_machine == 'amd64') or (python_full_version < '3.13' and platform_machine == 'ppc64le') or (python_full_version < '3.13' and platform_machine == 'win32') or (python_full_version < '3.13' and platform_machine == 'x86_64') # via sqlalchemy -# gym==0.26.2 (excluded) - # via nes-py -gym-notices==0.0.8 - # via gym -gym-super-mario-bros==7.3.2 - # via plangym gymnasium==0.29.1 # via plangym # via shimmy @@ -185,6 +183,7 @@ ipykernel==6.29.5 # via jupyterlab # via myst-nb ipython==8.27.0 + # via fragile-gym # via ipykernel # via myst-nb isoduration==20.11.0 @@ -287,9 +286,6 @@ nbformat==5.10.4 # via myst-nb # via nbclient # via nbconvert -nes-py @ git+https://github.com/FragileTech/nes-py@1ca4da5a97ac8987874f214054ccbd08e102a899 - # via gym-super-mario-bros - # via plangym nest-asyncio==1.6.0 # via ipykernel notebook-shim==0.2.4 @@ -299,12 +295,11 @@ numpy==2.1.0 # via dm-control # via dm-env # via fragile-gym - # via gym + # via fragile-nes-py # via gymnasium # via imageio # via labmaze # via mujoco - # via nes-py # via opencv-python # via plangym # via scipy @@ -366,7 +361,7 @@ pygame==2.6.0 # via gymnasium # via plangym pyglet==1.5.11 - # via nes-py + # via fragile-nes-py # via plangym # via stable-retro pygments==2.18.0 @@ -445,7 +440,7 @@ scipy==1.14.1 # via dm-control send2trash==1.8.3 # via jupyter-server -setuptools==74.0.0 +setuptools==74.1.0 # via dm-control # via jupyterlab # via labmaze @@ -480,7 +475,7 @@ sphinx==8.0.2 # via sphinx-togglebutton # via sphinxcontrib-bibtex # via sphinxext-opengraph -sphinx-autoapi==3.3.0 +sphinx-autoapi==3.3.1 # via plangym sphinx-autodoc2==0.5.0 # via plangym @@ -539,7 +534,7 @@ tornado==6.4.1 tqdm==4.66.5 # via autorom # via dm-control - # via nes-py + # via fragile-nes-py traitlets==5.14.3 # via comm # via ipykernel diff --git a/requirements.lock b/requirements.lock index a083927..9fb8762 100644 --- a/requirements.lock +++ b/requirements.lock @@ -79,7 +79,6 @@ click==8.1.7 # via ray cloudpickle==3.0.0 # via fragile-gym - # via gym # via gymnasium colorama==0.4.6 ; sys_platform == 'win32' or platform_system == 'Windows' # via click @@ -122,7 +121,7 @@ exceptiongroup==1.2.2 ; python_full_version < '3.11' # via pytest execnet==2.1.1 # via pytest-xdist -executing==2.0.1 +executing==2.1.0 # via stack-data farama-notifications==0.0.4 # via gymnasium @@ -134,7 +133,12 @@ flogging==0.0.22 # via plangym fqdn==1.5.1 # via jsonschema -fragile-gym==1.21.0 +fragile-gym==1.21.1 + # via fragile-nes-py + # via plangym +fragile-gym-super-mario-bros==7.4.0 + # via plangym +fragile-nes-py==10.0.1 # via plangym frozenlist==1.4.1 # via aiosignal @@ -146,12 +150,6 @@ glfw==2.7.0 # via mujoco greenlet==3.0.3 ; (python_full_version < '3.13' and platform_machine == 'AMD64') or (python_full_version < '3.13' and platform_machine == 'WIN32') or (python_full_version < '3.13' and platform_machine == 'aarch64') or (python_full_version < '3.13' and platform_machine == 'amd64') or (python_full_version < '3.13' and platform_machine == 'ppc64le') or (python_full_version < '3.13' and platform_machine == 'win32') or (python_full_version < '3.13' and platform_machine == 'x86_64') # via sqlalchemy -# gym==0.26.2 (excluded) - # via nes-py -gym-notices==0.0.8 - # via gym -gym-super-mario-bros==7.3.2 - # via plangym gymnasium==0.29.1 # via plangym # via shimmy @@ -185,6 +183,7 @@ ipykernel==6.29.5 # via jupyterlab # via myst-nb ipython==8.27.0 + # via fragile-gym # via ipykernel # via myst-nb isoduration==20.11.0 @@ -287,9 +286,6 @@ nbformat==5.10.4 # via myst-nb # via nbclient # via nbconvert -nes-py @ git+https://github.com/FragileTech/nes-py@1ca4da5a97ac8987874f214054ccbd08e102a899 - # via gym-super-mario-bros - # via plangym nest-asyncio==1.6.0 # via ipykernel notebook-shim==0.2.4 @@ -299,12 +295,11 @@ numpy==2.1.0 # via dm-control # via dm-env # via fragile-gym - # via gym + # via fragile-nes-py # via gymnasium # via imageio # via labmaze # via mujoco - # via nes-py # via opencv-python # via plangym # via scipy @@ -366,7 +361,7 @@ pygame==2.6.0 # via gymnasium # via plangym pyglet==1.5.11 - # via nes-py + # via fragile-nes-py # via plangym # via stable-retro pygments==2.18.0 @@ -444,7 +439,7 @@ scipy==1.14.1 # via dm-control send2trash==1.8.3 # via jupyter-server -setuptools==74.0.0 +setuptools==74.1.0 # via dm-control # via jupyterlab # via labmaze @@ -479,7 +474,7 @@ sphinx==8.0.2 # via sphinx-togglebutton # via sphinxcontrib-bibtex # via sphinxext-opengraph -sphinx-autoapi==3.3.0 +sphinx-autoapi==3.3.1 # via plangym sphinx-autodoc2==0.5.0 # via plangym @@ -538,7 +533,7 @@ tornado==6.4.1 tqdm==4.66.5 # via autorom # via dm-control - # via nes-py + # via fragile-nes-py traitlets==5.14.3 # via comm # via ipykernel diff --git a/src/plangym/api_tests.py b/src/plangym/api_tests.py index fe9ae4a..dd10556 100644 --- a/src/plangym/api_tests.py +++ b/src/plangym/api_tests.py @@ -439,7 +439,7 @@ def test_render(self, env, display): def test_wrap_environment(self, env): if isinstance(env, VectorizedEnv): return - from gym.wrappers.transform_reward import TransformReward # noqa: PLC0415 + from gymnasium.wrappers.transform_reward import TransformReward # noqa: PLC0415 wrappers = [(TransformReward, {"f": lambda x: x})] env.apply_wrappers(wrappers)