Drop yubikey-manager submodule

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "vendor/qt-solutions"]
 	path = vendor/qt-solutions
 	url = https://github.com/qtproject/qt-solutions
-[submodule "vendor/yubikey-manager"]
-	path = vendor/yubikey-manager
-	url = https://github.com/Yubico/yubikey-manager.git

.travis.yml

@@ -25,13 +25,6 @@ services:
   - docker
 
 before_install:
-  - |
-    if [[ "$TRAVIS_OS_NAME" == "linux" ]]
-    then
-      docker build -t ykman-xenial -f vendor/yubikey-manager/docker/xenial/Dockerfile vendor/yubikey-manager
-      id=$(docker create ykman-xenial)
-      docker cp $id:/yubikey-manager-debian-packages.tar.gz ykman-deb.tar.gz
-    fi
   - |
     if [[ "$TRAVIS_OS_NAME" == "osx" ]]
     then

debian/control

@@ -18,9 +18,7 @@ Build-Depends: debhelper (>= 9),
                qml-module-qtquick-dialogs,
                qml-module-io-thp-pyotherside,
                qml-module-qt-labs-settings,
-               libqt5svg5-dev,
+               libqt5svg5-dev
-               yubikey-manager (>= 0.6),
-               yubikey-manager (< 0.7)
 Homepage: https://developers.yubico.com/yubioath-desktop/
 
 Package: yubioath-desktop

doc/development.adoc

@@ -2,7 +2,8 @@
 
 Yubico Authenticator is a Qt5 application written in QML that uses the plugin PyOtherSide to enable 
 the backend logic to be written in Python 3.  The python library yubikey-manager is needed to communicate with the YubiKey,
-and is included as a submodule in the repository. It can also be installed through pip and some other package managers.
+and may be installed from pip or other package managers. If a specific version, (or branch or commit) is needed for development,
+point to that version in requirements.txt.
 
 == Setting up a development environment 
 
@@ -15,15 +16,15 @@ and is included as a submodule in the repository. It can also be installed throu
 
     $ sudo add-apt-repository -y ppa:yubico/stable
     $ sudo apt update
-    $ sudo apt install yubikey-manager qml-module-qt-labs-settings qml-module-qtquick-dialogs \
+    $ sudo apt install python3-yubikey-manager qml-module-qt-labs-settings qml-module-qtquick-dialogs \
       qml-module-qtquick-controls qt5-default libqt5svg5-dev qtdeclarative5-dev qtbase5-dev
 
 === Install dependencies on macOS 10.12 (Sierra)
 
     $ brew install python3 swig ykpers libu2f-host libusb qt5
-    $ wget https://github.com/thp/pyotherside/archive/1.5.3.tar.gz
+    $ brew link qt5 --force
-    $ tar -xzvf 1.5.3.tar.gz
+
-    $ cd pyotherside-1.5.3 && qmake && make && make install && cd ..
+Build and install the Qt5 plugin http://pyotherside.readthedocs.io/en/latest/#building-pyotherside[PyOtherSide].
 
 === Compile the app:
 

docker/xenial/Dockerfile

@@ -29,14 +29,8 @@ RUN apt-get install -qq \
     python3-dev
 RUN pip3 install --upgrade pip
 COPY . yubioath-desktop
-RUN tar xfa yubioath-desktop/ykman-deb.tar.gz
+RUN pip3 install -r yubioath-desktop/requirements.txt
-# Make sure .deb files exist
-RUN ls /deb/python3-yubikey-manager_*.deb
-RUN ls /deb/yubikey-manager_*.deb
-RUN dpkg -i /deb/python3-yubikey-manager_*.deb; exit 0
-RUN dpkg -i /deb/yubikey-manager_*.deb; exit 0
-RUN apt-get install -f -qq
 RUN cd yubioath-desktop && qmake -qt=qt5 && make
 RUN cd yubioath-desktop && debuild -us -uc
-RUN mv /yubioath-desktop_* /deb
+RUN mkdir /deb && mv /yubioath-desktop_* /deb
 RUN cd / && tar czf yubioath-desktop-debian-packages.tar.gz deb

requirements-win.txt

@@ -1,2 +0,0 @@
-.\vendor\yubikey-manager
-.\py\qr

requirements.txt

@@ -1,2 +1,2 @@
-./vendor/yubikey-manager
+yubikey-manager>=0.6,<0.7
-py/qr
+./py/qr

vendor/yubikey-manager

@@ -1 +0,0 @@
-Subproject commit 8d7756f7a3218615ec4254a9d7569959ca05df1d

yubioath-desktop.pro

@@ -54,8 +54,8 @@ win32|macx {
 macx {
     pip.commands = python3 -m venv pymodules && source pymodules/bin/activate && pip3 install -r requirements.txt && deactivate
 }
-win32 {
+!macx {
-    pip.commands = pip3 install -r requirements-win.txt --target pymodules
+    pip.commands = pip3 install -r requirements.txt --target pymodules
 }
 
 # Default rules for deployment.