diff --git a/.circleci/config.yml b/.circleci/config.yml index 3dc928069..7a8d5680d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: diff --git a/bundler/verify-bundle b/bundler/verify-bundle index be715ce03..966bee1b2 100755 --- a/bundler/verify-bundle +++ b/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 diff --git a/debian-pkg/debian/rules b/debian-pkg/debian/rules index ac05bc08d..054e63cc9 100755 --- a/debian-pkg/debian/rules +++ b/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 {} \; diff --git a/debian-pkg/debian/tinypilot.lintian-overrides b/debian-pkg/debian/tinypilot.lintian-overrides index 0b73e73ae..4d4f661f6 100644 --- a/debian-pkg/debian/tinypilot.lintian-overrides +++ b/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]