Skip to content

Commit 6d47d7a

Browse files
Merge branch 'master' into dev
# Conflicts: # docs/guide.installation.rst
2 parents 5e0898c + 499381c commit 6d47d7a

File tree

5 files changed

+14
-5
lines changed

5 files changed

+14
-5
lines changed

docs/changelog/v0.3.0.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@ v0.3.0 (August 4, 2020)
6767
Major Updates
6868
~~~~~~~~~~~~~
6969

70-
* **Python 3** - We've finally made it to Python 3! Specifically we have brought Autopilot up to compatibility with Python 3.8.
71-
The Spinnaker SDK is currently only available through Python 3.7, so we have tested Autopilot on 3.6, 3.7, and 3.8.
70+
* **Python 3** - We've finally made it to Python 3! Specifically we have brought Autopilot up to compatibility with Python 3.8 -- though
71+
the Spinnaker SDK is currently only available through Python 3.7, so we have formally required 3.7 for now while we work on moving
72+
acquisition to Aravis.
7273
I will *not attempt to keep Autopilot compatible with Python 2*, but no decision has been made about compatibility
7374
with other versions of Python 3. Until then, expect that Autopilot will attempt to keep up with major version changes.
7475
The switch also let up update PySide (Qt library used for the GUI) to PySide2, which uses Qt5 and has a whole raft of other improvements.

docs/guide.configuration.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
just unlinked stubs for future configuration page.
2+
3+
You probably want to set the agent name (e.g.: "Pilot 1").

docs/guide.installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Now install the system packages that are required by Autopilot. You can do this
6161
On the Terminal device
6262
----------------------
6363

64-
On the computer that will run the Terminal, you also need to install virtualenv and create a virtualenv for Autopilot, but you don't need to install all the system dependencies (the line beginning with "sudo apt install").
64+
On the computer that will run the Terminal, you also need to install virtualenv and create a virtualenv for Autopilot, but you don't need to install all the system dependencies (the line beginning with "sudo apt install").
6565

6666
Creating a Virtual Environment
6767
------------------------------

docs/index.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ For a detailed overview of Autopilot's motivation, design, and structure, see ou
1818

1919
.. admonition:: What's New :ref:`(v0.3.0) <changelog_v030>`
2020

21-
* Autopilot has moved to Python 3!! (Tested on 3.6-3.8)
21+
* Autopilot has moved to Python 3!! (Tested on 3.6-3.8, but 3.7 is currently required because the Spinnaker SDK currently only has armhf
22+
binaries released for 3.7)
2223
* Capturing video with OpenCV and the Spinnaker SDK is now supported (See :mod:`autopilot.hardware.cameras`)
2324
* An :class:`~hardware.i2c.I2C_9DOF` motion sensor and the :class:`~hardware.i2c.MLX90640` temperature sensor
2425
are now supported.

setup.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
import subprocess
88
import sys
99

10+
# fix user install issue
11+
import site
12+
site.ENABLE_USER_SITE = "--user" in sys.argv[1:]
1013

1114
# declare defaults
1215
IS_RASPI = False
@@ -143,4 +146,5 @@ def get_version(rel_path):
143146
"Operating System :: MacOS",
144147
"Topic :: Scientific/Engineering"
145148
],
146-
)
149+
python_requires="==3.7.*"
150+
)

0 commit comments

Comments
 (0)