Merge branch 'master' into zoo-8

CHANGELOG.md

@@ -13,6 +13,7 @@ Copy and pasting the git commit messages is __NOT__ enough.
 ### Changed
 ### Deprecated
 ### Fixed
+- Fixed issue where `SumoTrafficSimulation` could get locked up on reset if a scenario had only 1 map but multiple scenario variations.
 ### Removed
 ### Security
 

Makefile

@@ -36,8 +36,7 @@ sanity-test: build-sanity-scenarios
 		./smarts/core/tests/test_dynamics_backend.py::test_set_pose \
 		./smarts/core/tests/test_sensors.py::test_waypoints_sensor \
 		./smarts/core/tests/test_smarts.py::test_smarts_doesnt_leak_tasks_after_reset \
-		./examples/tests/test_examples.py::test_examples[hiway_v1] \
-		./examples/tests/test_examples.py::test_examples[laner] \
+		./examples/tests/test_examples.py::test_examples[e2_single_agent] \
 		./smarts/env/tests/test_social_agent.py::test_social_agents_not_in_env_obs_keys
 
 .PHONY: test-learning

docs/setup.rst

@@ -62,7 +62,8 @@ Run the following commands to setup the SMARTS simulator.
     # `camera_obs` - needed for rendering camera observations, and for testing.
     # `sumo` - needed for using SUMO scenarios.
     # `test` - needed for testing.
-    $ pip install -e .[camera_obs,sumo,test]
+    # `example` - needed for running examples.
+    $ pip install -e .[camera_obs,sumo,test,example]
 
     # Run sanity-test and verify they are passing.
     # If tests fail, check './sanity_test_result.xml' for test report. 

requirements.txt

@@ -1,26 +1,26 @@
-absl-py==1.4.0
+absl-py==2.0.0
 aiosignal==1.3.1
 astunparse==1.6.3
 attrs==23.1.0
 Automat==22.10.0
 cachetools==5.3.1
 certifi==2023.7.22
 charset-normalizer==3.2.0
-click==8.1.6
+click==8.1.7
 cloudpickle==2.2.1
-cmake==3.27.1
+cmake==3.27.5
 constantly==15.1.0
-coverage==7.2.7
+coverage==7.3.1
 decorator==5.1.1
 dm-tree==0.1.8
-exceptiongroup==1.1.2
+exceptiongroup==1.1.3
 execnet==2.0.2
-filelock==3.12.2
+filelock==3.12.4
 flatbuffers==23.5.26
 frozenlist==1.4.0
 future==0.18.3
 gast==0.4.0
-google-auth==2.22.0
+google-auth==2.23.1
 google-auth-oauthlib==1.0.0
 google-pasta==0.2.0
 grpcio==1.51.3
@@ -29,25 +29,25 @@ gymnasium-notices==0.0.1
 h5py==3.9.0
 hyperlink==21.0.0
 idna==3.4
-imageio==2.31.1
+imageio==2.31.4
 importlib-metadata==6.8.0
-importlib-resources==6.0.1
+importlib-resources==6.1.0
 incremental==22.10.0
 iniconfig==2.0.0
 Jinja2==3.1.2
-jsonschema==4.19.0
+jsonschema==4.19.1
 jsonschema-specifications==2023.7.1
 keras==2.13.1
 lazy_loader==0.3
 libclang==16.0.6
-lit==16.0.6
+lit==17.0.1
 lz4==4.3.2
 Markdown==3.4.4
 markdown-it-py==3.0.0
 MarkupSafe==2.1.3
 mdurl==0.1.2
 mpmath==1.3.0
-msgpack==1.0.5
+msgpack==1.0.7
 networkx==3.1
 numpy==1.24.3
 nvidia-cublas-cu11==11.10.3.66
@@ -62,41 +62,41 @@ nvidia-cusparse-cu11==11.7.4.91
 nvidia-nccl-cu11==2.14.3
 nvidia-nvtx-cu11==11.7.91
 oauthlib==3.2.2
-opencv-python==4.8.0.74
-opencv-python-headless==4.8.0.74
+opencv-python==4.8.1.78
+opencv-python-headless==4.8.1.78
 opt-einsum==3.3.0
 packaging==23.1
 Panda3D==1.10.13
 panda3d-gltf==0.13
 panda3d-simplepbr==0.10
 pandas==2.0.3
-Pillow==10.0.0
+Pillow==10.0.1
 pkgutil_resolve_name==1.3.10
-pluggy==1.2.0
-protobuf==4.23.4
+pluggy==1.3.0
+protobuf==4.24.3
 psutil==5.9.5
 py==1.11.0
 py-cpuinfo==9.0.0
-pyarrow==12.0.1
+pyarrow==13.0.0
 pyasn1==0.5.0
 pyasn1-modules==0.3.0
 pybullet==3.2.5
 Pygments==2.16.1
-pytest==7.4.0
+pytest==7.4.2
 pytest-benchmark==4.0.0
 pytest-cov==4.1.0
 pytest-forked==1.6.0
 pytest-xdist==3.3.1
 python-dateutil==2.8.2
-pytz==2023.3
+pytz==2023.3.post1
 PyWavelets==1.4.1
 PyYAML==6.0.1
 ray==2.5.1
 referencing==0.30.2
 requests==2.31.0
 requests-oauthlib==1.3.1
-rich==13.5.2
-rpds-py==0.9.2
+rich==13.5.3
+rpds-py==0.10.3
 rsa==4.9
 scikit-image==0.21.0
 scipy==1.10.1
@@ -106,26 +106,26 @@ sympy==1.12
 tableprint==0.9.1
 tensorboard==2.13.0
 tensorboard-data-server==0.7.1
-tensorboardX==2.6.2
-tensorflow==2.13.0
+tensorboardX==2.6.2.2
+tensorflow==2.13.1
 tensorflow-estimator==2.13.0
-tensorflow-io-gcs-filesystem==0.33.0
+tensorflow-io-gcs-filesystem==0.34.0
 tensorflow-probability==0.21.0
 termcolor==2.3.0
 tifffile==2023.7.10
 tomli==2.0.1
 torch==2.0.1
 torchvision==0.15.2
-trimesh==3.23.1
+trimesh==3.23.5
 triton==2.0.0
-Twisted==22.10.0
+Twisted==23.8.0
 typer==0.9.0
 typing_extensions==4.5.0
 tzdata==2023.3
-urllib3==1.26.16
+urllib3==2.0.5
 wcwidth==0.2.6
-Werkzeug==2.3.6
+Werkzeug==2.3.7
 wrapt==1.15.0
 yattag==1.15.1
-zipp==3.16.2
+zipp==3.17.0
 zope.interface==6.0

smarts/core/sumo_traffic_simulation.py

@@ -430,8 +430,7 @@ def teardown(self):
             except traci.exceptions.FatalTraCIError:
                 pass
 
-        if self._allow_reload:
-            self._cumulative_sim_seconds = 0
+        self._cumulative_sim_seconds = 0
         self._non_sumo_vehicle_ids = set()
         self._sumo_vehicle_ids = set()
         self._hijacked = set()

utils/setup/mac_requirements.txt

@@ -1,25 +1,25 @@
-absl-py==1.4.0
+absl-py==2.0.0
 aiosignal==1.3.1
 astunparse==1.6.3
 attrs==23.1.0
 Automat==22.10.0
 cachetools==5.3.1
 certifi==2023.7.22
-charset-normalizer==3.2.0
+charset-normalizer==3.3.0
 click==8.1.7
 cloudpickle==2.2.1
 constantly==15.1.0
-coverage==7.3.0
+coverage==7.3.2
 decorator==5.1.1
 dm-tree==0.1.8
 exceptiongroup==1.1.3
 execnet==2.0.2
-filelock==3.12.2
+filelock==3.12.4
 flatbuffers==23.5.26
 frozenlist==1.4.0
 future==0.18.3
 gast==0.4.0
-google-auth==2.22.0
+google-auth==2.23.2
 google-auth-oauthlib==1.0.0
 google-pasta==0.2.0
 grpcio==1.49.1
@@ -28,13 +28,13 @@ gymnasium-notices==0.0.1
 h5py==3.9.0
 hyperlink==21.0.0
 idna==3.4
-imageio==2.31.3
+imageio==2.31.5
 importlib-metadata==6.8.0
-importlib-resources==6.0.1
+importlib-resources==6.1.0
 incremental==22.10.0
 iniconfig==2.0.0
 Jinja2==3.1.2
-jsonschema==4.19.0
+jsonschema==4.19.1
 jsonschema-specifications==2023.7.1
 keras==2.13.1
 lazy_loader==0.3
@@ -45,22 +45,22 @@ markdown-it-py==3.0.0
 MarkupSafe==2.1.3
 mdurl==0.1.2
 mpmath==1.3.0
-msgpack==1.0.5
+msgpack==1.0.7
 networkx==3.1
 numpy==1.24.3
 oauthlib==3.2.2
-opencv-python==4.8.0.76
-opencv-python-headless==4.8.0.76
+opencv-python==4.8.1.78
+opencv-python-headless==4.8.1.78
 opt-einsum==3.3.0
-packaging==23.1
+packaging==23.2
 Panda3D==1.10.13
 panda3d-gltf==0.13
 panda3d-simplepbr==0.10
 pandas==2.0.3
-Pillow==10.0.0
+Pillow==10.0.1
 pkgutil_resolve_name==1.3.10
 pluggy==1.3.0
-protobuf==4.24.2
+protobuf==4.24.3
 psutil==5.9.5
 py==1.11.0
 py-cpuinfo==9.0.0
@@ -69,21 +69,21 @@ pyasn1==0.5.0
 pyasn1-modules==0.3.0
 pybullet==3.2.5
 Pygments==2.16.1
-pytest==7.4.1
+pytest==7.4.2
 pytest-benchmark==4.0.0
 pytest-cov==4.1.0
 pytest-forked==1.6.0
 pytest-xdist==3.3.1
 python-dateutil==2.8.2
-pytz==2023.3
+pytz==2023.3.post1
 PyWavelets==1.4.1
 PyYAML==6.0.1
 ray==2.5.1
 referencing==0.30.2
 requests==2.31.0
 requests-oauthlib==1.3.1
-rich==13.5.2
-rpds-py==0.10.2
+rich==13.6.0
+rpds-py==0.10.3
 rsa==4.9
 scikit-image==0.21.0
 scipy==1.10.1
@@ -94,9 +94,9 @@ tableprint==0.9.1
 tensorboard==2.13.0
 tensorboard-data-server==0.7.1
 tensorboardX==2.6.2.2
-tensorflow==2.13.0
+tensorflow==2.13.1
 tensorflow-estimator==2.13.0
-tensorflow-io-gcs-filesystem==0.33.0
+tensorflow-io-gcs-filesystem==0.34.0
 tensorflow-probability==0.21.0
 termcolor==2.3.0
 tifffile==2023.7.10
@@ -108,10 +108,10 @@ Twisted==23.8.0
 typer==0.9.0
 typing_extensions==4.5.0
 tzdata==2023.3
-urllib3==1.26.16
-wcwidth==0.2.6
-Werkzeug==2.3.7
+urllib3==2.0.6
+wcwidth==0.2.8
+Werkzeug==3.0.0
 wrapt==1.15.0
 yattag==1.15.1
-zipp==3.16.2
+zipp==3.17.0
 zope.interface==6.0