CI cleanups

.travis.yml

@@ -31,6 +31,7 @@ before_install:
       # Patch PyOtherSide to not be built with debug output
       echo "DEFINES += QT_NO_DEBUG_OUTPUT" >> vendor/pyotherside/src/src.pro
     fi
+  - pip install --upgrade pip
 
 install:
   - |
@@ -45,7 +46,6 @@ install:
       eval "$(pyenv init -)"
       env PYTHON_CONFIGURE_OPTS="--enable-framework CC=clang" pyenv install $PY_VERSION
       pyenv global system $PY_VERSION
-      # Upgrade pip
       pip install --upgrade pip
       # Build and install PyOtherside
       cd vendor/pyotherside
@@ -55,7 +55,6 @@ install:
       cd ../../
     fi
   # Install linting tools
-  - pip install --upgrade pip
   - sudo pip install pre-commit flake8
 
 before_script:

appveyor.yml

@@ -11,6 +11,7 @@ environment:
   LIBU2F_HOST_VERSION: "1.1.3"
   YKPERS_VERSION: "1.18.0"
   LIBUSB_VERSION: "1.0.21"
+  PY_VERSION: "3.6.2"
 
 init:
   # Needed for jom to work.
@@ -21,7 +22,6 @@ init:
 install:
   # Submodules are not cloned by default
   - git submodule update --init --recursive
-
   - choco install swig -y
   - choco upgrade swig 
 
@@ -59,8 +59,8 @@ after_build:
   - 7z x libusb-%LIBUSB_VERSION%.7z -o".\libusb"
   - ps: Copy-Item .\libusb\MS32\dll\*.dll .\release -Force 
 
-  - ps: wget https://www.python.org/ftp/python/3.6.1/python-3.6.1-embed-win32.zip -OutFile python-3.6.1-embed-win32.zip
-  - 7z x python-3.6.1-embed-win32.zip -o".\release"
+  - ps: wget https://www.python.org/ftp/python/$env:PY_VERSION/python-$env:PY_VERSION-embed-win32.zip -OutFile python-$env:PY_VERSION-embed-win32.zip
+  - 7z x python-%PY_VERSION%-embed-win32.zip -o".\release"
   # Use Qt deployment tool on executable
   - windeployqt .\release\yubioath-desktop.exe --qmldir=qml --no-translations --angle --release
   # Workaround: