From 694e2051a2fa48260a2b48961810259b3506d51a Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 6 Feb 2020 06:19:05 -0600 Subject: [PATCH 1/7] 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 From 95a640cc20191eb73258c783bd046a8fd3c53264 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 6 Feb 2020 06:46:30 -0600 Subject: [PATCH 2/7] update the virtualenv call --- roles/calibre-web/tasks/install.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/calibre-web/tasks/install.yml b/roles/calibre-web/tasks/install.yml index c6c24eaeb..1f5f4cc01 100644 --- a/roles/calibre-web/tasks/install.yml +++ b/roles/calibre-web/tasks/install.yml @@ -47,8 +47,8 @@ requirements: "{{ calibreweb_venv_path }}/requirements.txt" virtualenv: "{{ calibreweb_venv_path }}" # /usr/local/calibre-web-py3 virtualenv_site_packages: no - virtualenv_command: /usr/bin/virtualenv - virtualenv_python: python3.7 + virtualenv_command: python3 -m venv {{ calibreweb_venv_path }} +# virtualenv_python: python3.7 when: internet_available | bool # 2020-02-02: IS PYTHON 3 POSSIBLE ABOVE AND BELOW? From 807f94a6a195c0967091a98b434179a737f982d2 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 6 Feb 2020 07:35:58 -0600 Subject: [PATCH 3/7] update pip3 call --- roles/calibre-web/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre-web/tasks/install.yml b/roles/calibre-web/tasks/install.yml index 1f5f4cc01..b726b9826 100644 --- a/roles/calibre-web/tasks/install.yml +++ b/roles/calibre-web/tasks/install.yml @@ -43,7 +43,7 @@ ## # Implementing this with Ansible command module for now. - name: Download Calibre-Web dependencies (using pip) into python3.7 virtual environment {{ calibreweb_venv_path }} - pip: + pip3: requirements: "{{ calibreweb_venv_path }}/requirements.txt" virtualenv: "{{ calibreweb_venv_path }}" # /usr/local/calibre-web-py3 virtualenv_site_packages: no From 4ec22de8666351d1f045d899dfb57ebf62e4d9f3 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 13 Feb 2020 12:22:18 -0600 Subject: [PATCH 4/7] call venv's python3 bypassing the shabang line in cps.py --- roles/calibre-web/tasks/install.yml | 10 +++++----- roles/calibre-web/templates/calibre-web.service.j2 | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/calibre-web/tasks/install.yml b/roles/calibre-web/tasks/install.yml index b726b9826..063a26682 100644 --- a/roles/calibre-web/tasks/install.yml +++ b/roles/calibre-web/tasks/install.yml @@ -53,11 +53,11 @@ # 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? - file: - src: "{{ calibreweb_venv_path }}/lib/python3.7/site-packages" - path: "{{ calibreweb_venv_path }}/vendor" # /usr/local/calibre-web-py3 - state: link +#- 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/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 template: diff --git a/roles/calibre-web/templates/calibre-web.service.j2 b/roles/calibre-web/templates/calibre-web.service.j2 index 733a723e3..dcdf1bd3c 100644 --- a/roles/calibre-web/templates/calibre-web.service.j2 +++ b/roles/calibre-web/templates/calibre-web.service.j2 @@ -3,7 +3,7 @@ Description=Calibre-Web [Service] Type=simple User={{ calibreweb_user }} -ExecStart={{ calibreweb_exec_path }} -p {{ calibreweb_config }}/{{ calibreweb_settings_database }} +ExecStart={{ calibreweb_venv_path }}/bin/python3 {{ calibreweb_exec_path }} -p {{ calibreweb_config }}/{{ calibreweb_settings_database }} [Install] WantedBy=multi-user.target From e431831f2669e360aef33a2ff40088995ca3bfb9 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 13 Feb 2020 12:26:18 -0600 Subject: [PATCH 5/7] clean up --- roles/calibre-web/tasks/install.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/roles/calibre-web/tasks/install.yml b/roles/calibre-web/tasks/install.yml index 063a26682..e1c184b67 100644 --- a/roles/calibre-web/tasks/install.yml +++ b/roles/calibre-web/tasks/install.yml @@ -51,14 +51,6 @@ # 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? -# file: -# 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 template: src: calibre-web.service.j2 From 1f03fa52aba4ec5734bee196be151144139c045c Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Fri, 14 Feb 2020 00:59:56 -0600 Subject: [PATCH 6/7] Revert "update pip3 call" This reverts commit 807f94a6a195c0967091a98b434179a737f982d2. --- roles/calibre-web/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre-web/tasks/install.yml b/roles/calibre-web/tasks/install.yml index e1c184b67..8dc484165 100644 --- a/roles/calibre-web/tasks/install.yml +++ b/roles/calibre-web/tasks/install.yml @@ -43,7 +43,7 @@ ## # Implementing this with Ansible command module for now. - name: Download Calibre-Web dependencies (using pip) into python3.7 virtual environment {{ calibreweb_venv_path }} - pip3: + pip: requirements: "{{ calibreweb_venv_path }}/requirements.txt" virtualenv: "{{ calibreweb_venv_path }}" # /usr/local/calibre-web-py3 virtualenv_site_packages: no From a4bfb7db916ba5623441939f34da2d8d7e07309d Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Fri, 14 Feb 2020 01:04:45 -0600 Subject: [PATCH 7/7] python 3.7 > 3 --- roles/calibre-web/tasks/install.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/calibre-web/tasks/install.yml b/roles/calibre-web/tasks/install.yml index 8dc484165..05557a611 100644 --- a/roles/calibre-web/tasks/install.yml +++ b/roles/calibre-web/tasks/install.yml @@ -42,13 +42,12 @@ # ignore_errors: True ## # Implementing this with Ansible command module for now. -- name: Download Calibre-Web dependencies (using pip) into python3.7 virtual environment {{ calibreweb_venv_path }} +- name: Download Calibre-Web dependencies (using pip) into python3 virtual environment {{ calibreweb_venv_path }} pip: requirements: "{{ calibreweb_venv_path }}/requirements.txt" virtualenv: "{{ calibreweb_venv_path }}" # /usr/local/calibre-web-py3 virtualenv_site_packages: no virtualenv_command: python3 -m venv {{ calibreweb_venv_path }} -# virtualenv_python: python3.7 when: internet_available | bool - name: Install /etc/systemd/system/calibre-web.service from template