From 5c116fb3c91e872505300031d2bd60672b3a6e03 Mon Sep 17 00:00:00 2001 From: pzhokhov Date: Fri, 13 Jul 2018 14:05:56 -0700 Subject: [PATCH] box2d kengz vs py (#1097) * try build with box2d-kengz * test box2d envs * use box2d-py in tox.ini for tests * box2d-py instead of box2d-kengz in box2d dependencies * test dependencies in tox.ini use dependencies in setup.py * further cleanups of tox.ini * further cleanups * added scipy to list of requirements --- gym/envs/tests/spec_list.py | 2 -- setup.py | 4 ++-- tox.ini | 28 ++-------------------------- 3 files changed, 4 insertions(+), 30 deletions(-) diff --git a/gym/envs/tests/spec_list.py b/gym/envs/tests/spec_list.py index 601878847..af2f34d55 100644 --- a/gym/envs/tests/spec_list.py +++ b/gym/envs/tests/spec_list.py @@ -11,8 +11,6 @@ def should_skip_env_spec_for_tests(spec): return True if ( 'GoEnv' in ep or 'HexEnv' in ep or - ep.startswith('gym.envs.box2d:') or - ep.startswith('gym.envs.box2d:') or (ep.startswith("gym.envs.atari") and not spec.id.startswith("Pong") and not spec.id.startswith("Seaquest")) ): logger.warn("Skipping tests for env {}".format(ep)) diff --git a/setup.py b/setup.py index 5c5261d1c..cf8626e87 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ from version import VERSION # Environment-specific dependencies. extras = { 'atari': ['atari_py>=0.1.1', 'Pillow', 'PyOpenGL'], - 'box2d': ['Box2D-kengz'], + 'box2d': ['box2d-py'], 'classic_control': ['PyOpenGL'], 'mujoco': ['mujoco_py>=1.50', 'imageio'], 'robotics': ['mujoco_py>=1.50', 'imageio'], @@ -31,7 +31,7 @@ setup(name='gym', if package.startswith('gym')], zip_safe=False, install_requires=[ - 'numpy>=1.10.4', 'requests>=2.0', 'six', 'pyglet>=1.2.0', + 'scipy', 'numpy>=1.10.4', 'requests>=2.0', 'six', 'pyglet>=1.2.0', ], extras_require=extras, package_data={'gym': [ diff --git a/tox.ini b/tox.ini index 3d830b1ef..7563712f7 100644 --- a/tox.ini +++ b/tox.ini @@ -12,19 +12,7 @@ passenv=DISPLAY TRAVIS* deps = pytest mock - atari_py>=0.0.17 - Pillow - PyOpenGL - pachi-py>=0.0.19 - box2d-py - doom_py>=0.0.11 - mujoco_py>=1.50.1,<1.50.2 - keras - theano - numpy>=1.10.4 - requests>=2.0 - six - pyglet>=1.2.0 + -e .[all] commands = pytest {posargs} @@ -34,18 +22,6 @@ passenv=DISPLAY TRAVIS* deps = pytest mock - atari_py>=0.0.17 - Pillow - PyOpenGL - pachi-py>=0.0.19 - box2d-py - doom_py>=0.0.11 - mujoco_py<1.0.0,>=0.4.3 - keras - theano - numpy>=1.10.4 - requests>=2.0 - six - pyglet>=1.2.0 + -e .[all] commands = pytest {posargs}