Skip to content

Commit

Permalink
Update all supported Fedora versions to 30 and 31
Browse files Browse the repository at this point in the history
  • Loading branch information
pevogam committed Dec 3, 2019
1 parent eaf6ddd commit 45777c3
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ env:
- INSTALL_VARIANT=pip DISABLE_OCR=1 DISABLE_PYTORCH=1
matrix:
include:
- python: 3.6
env: INSTALL_VARIANT=rpm.fedora.28
- python: 3.7
env: INSTALL_VARIANT=rpm.fedora.29
env: INSTALL_VARIANT=rpm.fedora.30
- python: 3.7
env: INSTALL_VARIANT=rpm.fedora.31
- python: 3.6
env: INSTALL_VARIANT=deb.ubuntu.xenial
- python: 3.6
Expand Down
15 changes: 8 additions & 7 deletions packaging/packager_rpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -e

readonly distro="${DISTRO:-fedora}"
readonly version="${VERSION:-28}"
readonly version="${VERSION:-30}"

# rpm dependencies
dnf -y install python3 python3-coverage
Expand All @@ -21,11 +21,7 @@ dnf -y install tigervnc-server
# pip dependencies (not available as RPM)
dnf -y install gcc libX11-devel libXtst-devel python3-devel libpng-devel redhat-rpm-config
pip3 install autopy==1.1.1
pip3 install torch==0.4.1 torchvision==0.2.1
if [[ $version == "29" ]]; then
# TODO: on F29 with 0.4.1 we get RuntimeError: PyTorch was compiled without NumPy support
export DISABLE_PYTORCH=1
fi
pip3 install torch==0.4.1.post2 torchvision==0.2.1
pip3 install vncdotool==0.12.0

# rpm packaging
Expand All @@ -50,6 +46,11 @@ sleep 3 # give xvfb some time to start
# unit tests
dnf install -y python3-PyQt5
cd /lib/python3*/site-packages/guibot/tests
LIBPATH=".." COVERAGE="python3-coverage" sh run_tests.sh
if (( $version <= 30 )); then
COVERAGE="python3-coverage"
else
COVERAGE="coverage"
fi
LIBPATH=".." COVERAGE="$COVERAGE" sh run_tests.sh

exit 0

0 comments on commit 45777c3

Please sign in to comment.