From d9ecba8798af6fbe819349a481fda7f99668727a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Thu, 9 Mar 2017 07:00:45 +0000
Subject: [PATCH] Upgrade Nikola dependencies to the newest ones (#104)

---
 .travis.yml                      | 2 --
 common/configure_fresh_system.sh | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e5f668b6..fa4ed8f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,6 @@ matrix:
     include:
         - os: osx
           osx_image: xcode8.2
-        - os: linux
-          env: DETECTED_OS=fedora:24      DOCKER_IMAGE=cyplo/fedora24_base
         - os: linux
           env: DETECTED_OS=fedora:25      DOCKER_IMAGE=cyplo/fedora25_base
         - os: linux
diff --git a/common/configure_fresh_system.sh b/common/configure_fresh_system.sh
index 683f987d..3c669f49 100755
--- a/common/configure_fresh_system.sh
+++ b/common/configure_fresh_system.sh
@@ -207,10 +207,10 @@ if [[ -z $NOPYTHON3 ]]; then
         PIP=pip
     fi
     echo "Upgrading pip"
-    $SUDO $PIP install --upgrade pip
-    $SUDO $PIP install packaging
+    $SUDO $PIP install --upgrade pip setuptools
+    $SUDO $PIP install --upgrade packaging
     echo "Installing Nikola"
-    $SUDO $PIP install pygments-style-solarized ws4py watchdog webassets Nikola
+    $SUDO $PIP install --upgrade pygments-style-solarized ws4py watchdog webassets Nikola
 fi
 
 if [[ -z $USER ]]; then