Merge branch 'main' into dev

sneakers-the-rat · sneakers-the-rat · commit 690cca77e31b · 2022-06-01T19:29:56.000-07:00
diff --git a/autopilot/setup/scripts.py b/autopilot/setup/scripts.py
@@ -49,7 +49,7 @@
         'text': 'install system packages necessary for autopilot Pilots? (required if they arent already)',
         'commands': [
             "sudo apt-get update",
-            "sudo apt-get install -y build-essential cmake git python3-dev libatlas-base-dev libsamplerate0-dev libsndfile1-dev libreadline-dev libasound-dev i2c-tools libportmidi-dev liblo-dev libhdf5-dev libzmq-dev libffi-dev",
+            "sudo apt-get install -y build-essential cmake git python3-dev libatlas-base-dev libsamplerate0-dev libsndfile1-dev libreadline-dev libasound-dev i2c-tools libportmidi-dev liblo-dev libhdf5-dev libzmq3-dev libffi-dev",
         ]
     },
     'env_terminal': {
diff --git a/docs/guide/installation.rst b/docs/guide/installation.rst
@@ -61,7 +61,7 @@ in the guided installation of Autopilot. (``python -m autopilot.setup.run_script
         libportmidi-dev \
         liblo-dev \
         libhdf5-dev \
-        libzmq-dev \
+        libzmq3-dev \
         libffi-dev
 
 

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`'text': 'install system packages necessary for autopilot Pilots? (required if they arent already)',`
`50`	`50`	`'commands': [`
`51`	`51`	`"sudo apt-get update",`
`52`		`- "sudo apt-get install -y build-essential cmake git python3-dev libatlas-base-dev libsamplerate0-dev libsndfile1-dev libreadline-dev libasound-dev i2c-tools libportmidi-dev liblo-dev libhdf5-dev libzmq-dev libffi-dev",`
	`52`	`+ "sudo apt-get install -y build-essential cmake git python3-dev libatlas-base-dev libsamplerate0-dev libsndfile1-dev libreadline-dev libasound-dev i2c-tools libportmidi-dev liblo-dev libhdf5-dev libzmq3-dev libffi-dev",`
`53`	`53`	`]`
`54`	`54`	`},`
`55`	`55`	`'env_terminal': {`