Cleanup kivy test recipe:

- reuse requirements, follow KivyMD doc
  - remove unneeded packages
  - explicitly run python3 in test.sh
  - use pip for installation
This commit is contained in:
Lee Miller 2022-05-07 15:22:18 +03:00
parent aa512d0066
commit a38790da60
Signed by untrusted user: lee.miller
GPG Key ID: 4F97A5EA88F4AB63
4 changed files with 11 additions and 19 deletions

View File

@ -1,26 +1,16 @@
# A container for buildbot # A container for buildbot
FROM ubuntu:bionic AS kivy FROM ubuntu:bionic AS kivy
# FROM ubuntu:20.04 AS buildbot-bionic
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update RUN apt-get update
RUN apt-get -y install sudo RUN apt-get install -yq \
build-essential libcap-dev libssl-dev \
RUN apt-get install -yq python-setuptools \ libmtdev-dev libpq-dev \
python-setuptools libssl-dev libpq-dev python-prctl python-dev \ python3-dev python3-pip python3-virtualenv \
python-virtualenv python-pip virtualenv \ xvfb
libjpeg-dev zlib1g-dev python3-dev \
python3-virtualenv \
python3-pip \
wget \
build-essential libcap-dev libmtdev-dev xvfb xclip git python3-opencv
RUN ln -sf /usr/bin/python3 /usr/bin/python RUN ln -sf /usr/bin/python3 /usr/bin/python
RUN pip3 install Cython Pillow pyzbar telenium
RUN pip3 install --upgrade setuptools pip RUN pip3 install --upgrade setuptools pip
RUN pip3 install -e git+https://github.com/kivymd/KivyMD#egg=kivymd

View File

@ -1,3 +1,5 @@
#!/bin/sh #!/bin/sh
python setup.py install --user pip3 install -r kivy-requirements.txt
pip3 install .

View File

@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
xvfb-run python tests-kivy.py xvfb-run python3 tests-kivy.py

View File

@ -1,5 +1,5 @@
kivy-garden.qrcode kivy-garden.qrcode
-e git+https://github.com/kivymd/KivyMD#egg=kivymd https://github.com/kivymd/KivyMD/archive/master.zip
opencv-python opencv-python
pyzbar pyzbar
telenium telenium