Skip to content

Commit ee9ed51

Browse files
saran-tcopybara-github
authored andcommitted
Update requirements.txt and setup.py.
PiperOrigin-RevId: 800508302 Change-Id: Ie9b28dc9f295448bace7cee236026b18b9d44473
1 parent 66bd49a commit ee9ed51

File tree

4 files changed

+27
-37
lines changed

4 files changed

+27
-37
lines changed

dm_control/mujoco/wrapper/core_test.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
ARRAY_TYPES = (np.ndarray,)
3939

4040
OUT_DIR = absltest.get_default_test_tmpdir()
41-
if not os.path.exists(OUT_DIR):
42-
os.makedirs(OUT_DIR) # Ensure that the output directory exists.
41+
os.makedirs(OUT_DIR, exist_ok=True) # Ensure that the output directory exists.
4342

4443

4544
class CoreTest(parameterized.TestCase):

dm_control/viewer/gui/glfw_gui_test.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434

3535
glfw_gui.base.GL = _OPEN_GL_MOCK
3636
glfw_gui.base.shaders = _OPEN_GL_MOCK
37+
glfw_gui.fullscreen_quad.GL = _OPEN_GL_MOCK
38+
glfw_gui.fullscreen_quad.shaders = _OPEN_GL_MOCK
3739
glfw_gui.glfw = _GLFW_MOCK
3840

3941
# Pretend we are using GLFW for offscreen rendering so that the runtime backend

requirements.txt

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
1-
absl-py==2.2.2
1+
absl-py==2.3.1
22
dm-env==1.6
3-
dm-tree==0.1.8
4-
glfw==1.12.0
5-
h5py==3.13.0
3+
dm-tree==0.1.9
4+
glfw==2.9.0
5+
h5py==3.14.0
66
labmaze==1.0.6
7-
lxml==5.3.2
7+
lxml==6.0.1
88
mock==5.2.0
9-
mujoco==3.3.4
10-
nose==1.3.7
11-
nose-xunitmp==0.4.1
12-
numpy==1.26.4; python_version >= '3.9'
13-
pillow==10.3.0
14-
protobuf==3.19.4 # TensorFlow requires protobuf<3.20 (b/182876485)
15-
pyopengl==3.1.9
9+
mujoco==3.3.5
10+
numpy==2.3.2; python_version >= '3.11'
11+
numpy==2.2.6; python_version == '3.10'
12+
numpy==2.0.2; python_version == '3.9'
13+
pillow==11.3.0
14+
protobuf==3.19.4
15+
pyopengl==3.1.10
1616
pyparsing==3.2.3
17-
requests==2.32.3
18-
scipy==1.15.2; python_version >= '3.10'
19-
setuptools==78.1.1
17+
pytest==8.4.1
18+
pytest-xdist==3.8.0
19+
pytest-timeout==2.4.0
20+
requests==2.32.5
21+
scipy==1.16.1; python_version >= '3.11'
22+
scipy==1.15.3; python_version == '3.10'
23+
scipy==1.13.1; python_version == '3.9'
24+
setuptools==80.9.0
2025
tqdm==4.67.1

setup.py

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
from setuptools import find_packages
2828
from setuptools import setup
2929
from setuptools.command import install
30-
from setuptools.command import test
3130

3231
PLATFORM = platform.system()
3332

@@ -142,16 +141,6 @@ def run(self):
142141
install.install.run(self)
143142

144143

145-
class TestCommand(test.test):
146-
"""Prepends path to generated sources before running unit tests."""
147-
148-
def run(self):
149-
# Generate ctypes bindings in-place so that they can be imported in tests.
150-
self.reinitialize_command('build_mjbindings', inplace=1)
151-
self.run_command('build_mjbindings')
152-
test.test.run(self)
153-
154-
155144
def find_data_files(package_dir, patterns, excludes=()):
156145
"""Recursively finds files whose names match the given shell patterns."""
157146
paths = set()
@@ -192,10 +181,7 @@ def is_excluded(s):
192181
author='DeepMind',
193182
author_email='mujoco@deepmind.com',
194183
url='https://github.com/google-deepmind/dm_control',
195-
license='Apache License 2.0',
196-
classifiers=[
197-
'License :: OSI Approved :: Apache Software License',
198-
],
184+
license='Apache-2.0',
199185
keywords='machine learning control physics MuJoCo AI',
200186
python_requires='>=3.9',
201187
install_requires=[
@@ -205,9 +191,9 @@ def is_excluded(s):
205191
'glfw',
206192
'labmaze',
207193
'lxml',
208-
'mujoco >= 3.3.4',
194+
'mujoco >= 3.3.5',
209195
'numpy >= 1.9.0',
210-
'protobuf >= 3.19.4', # TensorFlow requires protobuf<3.20 (b/182876485)
196+
'protobuf >= 3.19.4',
211197
'pyopengl >= 3.1.4',
212198
'pyparsing >= 3.0.0',
213199
'requests',
@@ -220,10 +206,9 @@ def is_excluded(s):
220206
},
221207
tests_require=[
222208
'mock',
223-
'nose',
209+
'pytest',
224210
'pillow>=10.2.0',
225211
],
226-
test_suite='nose.collector',
227212
packages=find_packages(),
228213
package_data={
229214
'dm_control': find_data_files(
@@ -247,7 +232,6 @@ def is_excluded(s):
247232
cmdclass={
248233
'build_mjbindings': BuildMJBindingsCommand,
249234
'install': InstallCommand,
250-
'test': TestCommand,
251235
},
252236
entry_points={},
253237
)

0 commit comments

Comments
 (0)