Skip to content

Commit a495469

Browse files
DeepMindcopybara-github
authored andcommitted
Bump version number to 1.0.21, update some formatting.
PiperOrigin-RevId: 653288288 Change-Id: I4bf5f4e191e4d8ddd06febf85d5db0c08c2e7381
1 parent 85f0510 commit a495469

File tree

4 files changed

+35
-23
lines changed

4 files changed

+35
-23
lines changed

dm_control/mujoco/tutorial.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"\"\"\")\n",
9494
"\n",
9595
"print('Installing dm_control...')\n",
96-
"!pip install -q dm_control\u003e=1.0.20\n",
96+
"!pip install -q dm_control\u003e=1.0.21\n",
9797
"\n",
9898
"# Configure dm_control to use the EGL rendering backend (requires GPU)\n",
9999
"%env MUJOCO_GL=egl\n",

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ h5py==3.11.0
66
labmaze==1.0.6
77
lxml==5.2.2
88
mock==5.1.0
9-
mujoco==3.1.6
9+
mujoco==3.2.0
1010
nose==1.3.7
1111
nose-xunitmp==0.4.1
1212
numpy==1.24.4; python_version == '3.8'

setup.py

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,16 @@ def _finalize_mjbindings_options(cmd_instance):
7171

7272
class BuildMJBindingsCommand(setuptools.Command):
7373
"""Runs `autowrap.py` to generate the low-level ctypes bindings for MuJoCo."""
74+
7475
description = __doc__
7576
user_options = [
7677
# The format is (long option, short option, description).
77-
('headers-dir=', None,
78-
'Path to directory containing MuJoCo headers.'),
79-
('inplace=', None,
80-
'Place generated files in source directory rather than `build-lib`.'),
78+
('headers-dir=', None, 'Path to directory containing MuJoCo headers.'),
79+
(
80+
'inplace=',
81+
None,
82+
'Place generated files in source directory rather than `build-lib`.',
83+
),
8184
]
8285
boolean_options = ['inplace']
8386

@@ -99,7 +102,7 @@ def run(self):
99102
sys.executable or 'python',
100103
AUTOWRAP_PATH,
101104
'--header_paths={}'.format(self.header_paths),
102-
'--output_dir={}'.format(output_dir)
105+
'--output_dir={}'.format(output_dir),
103106
]
104107
self.announce('Running command: {}'.format(command), level=logging.DEBUG)
105108
try:
@@ -119,9 +122,11 @@ class InstallCommand(install.install):
119122
"""Runs 'build_mjbindings' before installation."""
120123

121124
user_options = (
122-
install.install.user_options + BuildMJBindingsCommand.user_options)
125+
install.install.user_options + BuildMJBindingsCommand.user_options
126+
)
123127
boolean_options = (
124-
install.install.boolean_options + BuildMJBindingsCommand.boolean_options)
128+
install.install.boolean_options + BuildMJBindingsCommand.boolean_options
129+
)
125130

126131
def initialize_options(self):
127132
install.install.initialize_options(self)
@@ -169,9 +174,10 @@ def is_excluded(s):
169174
paths.add(full_path)
170175
return list(paths)
171176

177+
172178
setup(
173179
name='dm_control',
174-
version='1.0.20',
180+
version='1.0.21',
175181
description='Continuous control environments and MuJoCo Python bindings.',
176182
long_description="""
177183
# `dm_control`: DeepMind Infrastructure for Physics-Based Simulation.
@@ -199,7 +205,7 @@ def is_excluded(s):
199205
'glfw',
200206
'labmaze',
201207
'lxml',
202-
'mujoco >= 3.1.6',
208+
'mujoco >= 3.2.0',
203209
'numpy >= 1.9.0',
204210
'protobuf >= 3.19.4', # TensorFlow requires protobuf<3.20 (b/182876485)
205211
'pyopengl >= 3.1.4',
@@ -220,17 +226,23 @@ def is_excluded(s):
220226
test_suite='nose.collector',
221227
packages=find_packages(),
222228
package_data={
223-
'dm_control':
224-
find_data_files(
225-
package_dir='dm_control',
226-
patterns=[
227-
'*.amc', '*.msh', '*.png', '*.skn', '*.stl', '*.xml',
228-
'*.textproto', '*.h5'
229-
],
230-
excludes=[
231-
'*/dog_assets/extras/*',
232-
'*/kinova/meshes/*', # Exclude non-decimated meshes.
233-
]),
229+
'dm_control': find_data_files(
230+
package_dir='dm_control',
231+
patterns=[
232+
'*.amc',
233+
'*.msh',
234+
'*.png',
235+
'*.skn',
236+
'*.stl',
237+
'*.xml',
238+
'*.textproto',
239+
'*.h5',
240+
],
241+
excludes=[
242+
'*/dog_assets/extras/*',
243+
'*/kinova/meshes/*', # Exclude non-decimated meshes.
244+
],
245+
),
234246
},
235247
cmdclass={
236248
'build_mjbindings': BuildMJBindingsCommand,

tutorial.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"\"\"\")\n",
9494
"\n",
9595
"print('Installing dm_control...')\n",
96-
"!pip install -q dm_control\u003e=1.0.20\n",
96+
"!pip install -q dm_control\u003e=1.0.21\n",
9797
"\n",
9898
"# Configure dm_control to use the EGL rendering backend (requires GPU)\n",
9999
"%env MUJOCO_GL=egl\n",

0 commit comments

Comments
 (0)