From 45777c3c88c4e9d43d0e8e24bd644e9c388a8f1d Mon Sep 17 00:00:00 2001
From: Plamen Dimitrov <pdimitrov@pevogam.com>
Date: Tue, 3 Dec 2019 11:06:41 +0200
Subject: [PATCH] Update all supported Fedora versions to 30 and 31

---
 .travis.yml               |  6 +++---
 packaging/packager_rpm.sh | 15 ++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ffa6bc4e..5f6c57f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/packaging/packager_rpm.sh b/packaging/packager_rpm.sh
index b1c41e55..7ac0eea0 100644
--- a/packaging/packager_rpm.sh
+++ b/packaging/packager_rpm.sh
@@ -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
@@ -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
@@ -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