Backport changes from Pro (#1933)

This PR backports some minor changes from
tiny-pilot/tinypilot-pro#1714, mostly to reduce
the diff noise between both repos.

Note that the size of the debian package increases from 2.6M to 3.4M,
and it also requires two new lintian rules. The reason is the added
`--upgrade-pip` flag for `dh_virtualenv`. We originally added this
option as part of the [front panel work in
Pro](tiny-pilot/tinypilot-pro#1662) (I’m not
exactly sure why that was necessary there, though). In any event, I
think the pip upgrade doesn’t actually harm (even if we don’t strictly
need it here), so maybe we should just keep it for consistency?
<a data-ca-tag
href="https://codeapprove.com/pr/tiny-pilot/tinypilot/1933"><img
src="https://codeapprove.com/external/github-tag-allbg.png" alt="Review
on CodeApprove" /></a>

---------

Co-authored-by: Jan Heuermann <jan@jotaen.net>

Author: jotaen4tinypilot

.circleci/config.yml

@@ -188,11 +188,9 @@ jobs:
     steps:
       - checkout
       - run:
-          name: Create virtual environment
-          command: python3 -m venv venv
-      - run:
-          name: Install python requirements
+          name: Install Python requirements of main app
           command: |
+            python3 -m venv venv
             . venv/bin/activate
             pip install --requirement dev_requirements.txt
       - run:

bundler/verify-bundle

@@ -22,8 +22,8 @@ if [[ "${BUNDLE_SIZE_BYTES}" -eq 0 ]]; then
   >&2 echo 'Bundle size is zero.'
   exit 1
 fi
-if (( "${BUNDLE_SIZE_BYTES}" > 10000000 )); then
-  >&2 echo 'Bundle size is larger than 10mb.'
+if (( "${BUNDLE_SIZE_BYTES}" > 15000000 )); then
+  >&2 echo 'Bundle size is larger than 15mb.'
   exit 1
 fi
 

debian-pkg/debian/rules

@@ -24,7 +24,11 @@ override_dh_installsystemd:
 override_dh_virtualenv:
 	# Skip install because TinyPilot doesn't need to run setup.py to install.
 	# Use the venv directory because that's where we've historically kept it.
-	dh_virtualenv --skip-install --install-suffix venv
+	dh_virtualenv \
+		--requirements=requirements.txt \
+		--install-suffix=venv \
+		--skip-install \
+		--upgrade-pip
 	# dh_virtualenv doesn't remove __pycache__ directories, so we clean them up
 	# manually.
 	find . -type d -name __pycache__ -prune -exec rm -rf {} \;

debian-pkg/debian/tinypilot.lintian-overrides

@@ -1,5 +1,6 @@
 # Suppress complaints about third-party dependencies we don't control.
 tinypilot: script-not-executable [opt/tinypilot/venv/lib/python*/site-packages/greenlet/tests/test_version.py]
+tinypilot: script-not-executable [opt/tinypilot/venv/lib/python*/site-packages/pip*]
 tinypilot: script-not-executable [opt/tinypilot/venv/lib/python*/site-packages/pkg_resources/_vendor/appdirs.py]
 tinypilot: script-not-executable [opt/tinypilot/venv/lib/python*/site-packages/setuptools/command/easy_install.py]
 tinypilot: national-encoding opt/tinypilot/venv/lib/python*/site-packages/passlib/tests/sample1c.cfg
@@ -12,5 +13,6 @@ tinypilot: unusual-interpreter /opt/tinypilot/venv/bin/python [opt/tinypilot/ven
 tinypilot: unusual-interpreter /opt/tinypilot/venv/bin/python [opt/tinypilot/venv/bin/pip*]
 tinypilot: unusual-interpreter /opt/tinypilot/venv/bin/python [opt/tinypilot/venv/bin/wheel*]
 tinypilot: unusual-interpreter python [opt/tinypilot/venv/lib/python*/site-packages/greenlet/tests/test_version.py]
+tinypilot: unusual-interpreter python [opt/tinypilot/venv/lib/python*/site-packages/pip*]
 tinypilot: unusual-interpreter python [opt/tinypilot/venv/lib/python*/site-packages/pkg_resources/_vendor/appdirs.py]
 tinypilot: unusual-interpreter python [opt/tinypilot/venv/lib/python*/site-packages/setuptools/command/easy_install.py]