Skip to content

Backport changes from Pro #1933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jotaen4tinypilot wants to merge 4 commits into
base: master
Choose a base branch
from
+11 −4
Open

Backport changes from Pro #1933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
13541a0
Backport changes from Pro
jotaen Jan 15, 2026
9fab838
Style
jotaen Jan 15, 2026
03b53c5
Add directives
jotaen Jan 15, 2026
c9592fb
Merge branch 'master' into pro-diff
jotaen Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,9 @@ jobs:
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:
Expand Down
4 changes: 2 additions & 2 deletions bundler/verify-bundle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 5 additions & 1 deletion debian-pkg/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {} \;
Expand Down
2 changes: 2 additions & 0 deletions debian-pkg/debian/tinypilot.lintian-overrides
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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]