Merge remote-tracking branch 'devel/public-branch' into 2.x

docs/quickstart.rst

@@ -43,6 +43,12 @@ Installing via either :command:`pip` or Poetry will install all of the dependenc
 	In the past, the ``shapely`` package did not install properly on Windows.
 	If you encounter this issue, try installing it manually following the instructions `here <https://github.com/Toblerity/Shapely#built-distributions>`__.
 
+.. note::
+
+	On some platforms, in particular OS X, you may get an error during the installation of `pygame <https://www.pygame.org/>`_ due to missing SDL files.
+	Try installing `SDL <https://www.libsdl.org/>`_: on OS X, if you use `Homebrew <https://brew.sh/>`_ you can simply run :command:`brew install sdl`.
+
+
 Trying Some Examples
 --------------------
 

docs/requirements.txt

@@ -7,51 +7,51 @@ attrs==19.3.0
 babel==2.8.0
 certifi==2020.6.20
 chardet==3.0.4
-colorama==0.4.3; sys_platform == "win32" or platform_system == "Windows"
+colorama==0.4.4; platform_system == "Windows"
+colorama==0.4.4; sys_platform == "win32"
 cycler==0.10.0
 distlib==0.3.1
 docutils==0.16
-dotmap==1.3.17
+dotmap==1.3.22
 filelock==3.0.12
 idna==2.10
 imagesize==1.2.0
-iniconfig==1.0.1
+iniconfig==1.1.1
 jinja2==2.11.2
 kiwisolver==1.2.0
 mapbox-earcut==0.12.10
 markupsafe==1.1.1
-matplotlib==3.3.1
-more-itertools==8.5.0
-numpy==1.19.1
+matplotlib==3.3.2
+numpy==1.19.2
 opencv-python==4.2.0.34
 packaging==20.4
 pillow==7.2.0
 pluggy==0.13.1
 py==1.9.0
-pygame==2.0.0.dev10
-pygments==2.6.1
+pygame==2.0.0.dev18
+pygments==2.7.1
 pynverse==0.1.4.4
 pyparsing==2.4.7
 pyproj==2.6.1.post1
-pytest==6.0.1
 pytest-randomly==3.4.1
+pytest==6.1.1
 python-dateutil==2.8.1
 pytz==2020.1
 requests==2.24.0
-scipy==1.5.2
+scipy==1.5.3
 shapely==1.7.1
 six==1.15.0
 snowballstemmer==2.0.0
-sphinx==3.2.1
 sphinx-rtd-theme==0.4.3
+sphinx==3.2.1
 sphinxcontrib-applehelp==1.0.2
 sphinxcontrib-devhelp==1.0.2
 sphinxcontrib-htmlhelp==1.0.3
 sphinxcontrib-jsmath==1.0.1
 sphinxcontrib-qthelp==1.0.3
 sphinxcontrib-serializinghtml==1.1.4
 toml==0.10.1
-tox==3.20.0
-urllib3==1.25.10
-virtualenv==20.0.31
+tox==3.20.1
+urllib3==1.25.11
+virtualenv==20.0.35
 wrapt==1.12.1

examples/driving/Carla_Challenge/carlaChallenge2.scenic

@@ -46,7 +46,7 @@ behavior LeadingCarBehavior(speed=10):
 # Please refer to scenic/domains/driving/roads.py how to access detailed road infrastructure
 # 'network' is the 'class Network' object in roads.py
 
-# make sure to put '*' to uniformly randomly select from all elements of the list, 'lanes'
+# make sure to put '*' to uniformly randomly select from all elements of the list, 'network.lanes'
 lane = Uniform(*network.lanes)
 
 ##OBJECT PLACEMENT