From 694e2051a2fa48260a2b48961810259b3506d51a Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Thu, 6 Feb 2020 06:19:05 -0600
Subject: [PATCH] test calibre-web under python3

---
 roles/calibre-web/defaults/main.yml |  2 +-
 roles/calibre-web/tasks/install.yml | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/roles/calibre-web/defaults/main.yml b/roles/calibre-web/defaults/main.yml
index 59a38fb1e..a52bc7e03 100644
--- a/roles/calibre-web/defaults/main.yml
+++ b/roles/calibre-web/defaults/main.yml
@@ -16,7 +16,7 @@
 
 calibreweb_version: 0.6.5    # WAS: master, 0.6.4
 
-calibreweb_venv_path: /usr/local/calibre-web
+calibreweb_venv_path: /usr/local/calibre-web-py3
 calibreweb_exec_path: "{{ calibreweb_venv_path }}/cps.py"
 
 # Config files put in:
diff --git a/roles/calibre-web/tasks/install.yml b/roles/calibre-web/tasks/install.yml
index 330ebe56b..c6c24eaeb 100644
--- a/roles/calibre-web/tasks/install.yml
+++ b/roles/calibre-web/tasks/install.yml
@@ -42,21 +42,21 @@
 #  ignore_errors: True
 ##
 # Implementing this with Ansible command module for now.
-- name: Download Calibre-Web dependencies (using pip) into python2.7 virtual environment {{ calibreweb_venv_path }}
+- name: Download Calibre-Web dependencies (using pip) into python3.7 virtual environment {{ calibreweb_venv_path }}
   pip:
     requirements: "{{ calibreweb_venv_path }}/requirements.txt"
-    virtualenv: "{{ calibreweb_venv_path }}"    # /usr/local/calibre-web
+    virtualenv: "{{ calibreweb_venv_path }}"    # /usr/local/calibre-web-py3
     virtualenv_site_packages: no
     virtualenv_command: /usr/bin/virtualenv
-    virtualenv_python: python2.7
+    virtualenv_python: python3.7
   when: internet_available | bool
 
 # 2020-02-02: IS PYTHON 3 POSSIBLE ABOVE AND BELOW?
 
-- name: Symlink {{ calibreweb_venv_path }}/vendor -> {{ calibreweb_venv_path }}/lib/python2.7/site-packages - to keep {{ calibreweb_venv_path }}/cps.py happy
+- name: Symlink {{ calibreweb_venv_path }}/vendor -> {{ calibreweb_venv_path }}/lib/python2.7/site-packages - to keep {{ calibreweb_venv_path }}/cps.py happy?
   file:
-    src: "{{ calibreweb_venv_path }}/lib/python2.7/site-packages"
-    path: "{{ calibreweb_venv_path }}/vendor"    # /usr/local/calibre-web
+    src: "{{ calibreweb_venv_path }}/lib/python3.7/site-packages"
+    path: "{{ calibreweb_venv_path }}/vendor"    # /usr/local/calibre-web-py3
     state: link
 
 - name: Install /etc/systemd/system/calibre-web.service from template