Merge pull request #3554 from jvonau/jupyterhub

Jupyterhub

roles/calibre-web/tasks/install.yml

@@ -1,8 +1,7 @@
-- name: "Install packages: imagemagick, python3-venv, python3-netifaces"
+- name: "Install packages: imagemagick, python3-netifaces"
   package:
     name:
       - imagemagick
-      - python3-venv
       - python3-netifaces
     state: present
 

roles/jupyterhub/tasks/install.yml

@@ -13,11 +13,16 @@
   when: nodejs_installed is undefined
 
 
-- name: "Install package: python3-venv"
+- name: "Install package: python3-psutil"
   package:
-    name: python3-venv
+    name: python3-psutil
     state: present
 
+- name: Remove previous virtual environment {{ jupyterhub_venv }}
+  file:
+    path: "{{ jupyterhub_venv }}"
+    state: absent
+
 - name: Make 3 directories to hold JupyterHub config
   file:
     state: directory
@@ -41,7 +46,7 @@
       - jupyterhub
     virtualenv: "{{ jupyterhub_venv }}"    # /opt/iiab/jupyterhub
     virtualenv_site_packages: no
-    virtualenv_command: python3 -m venv "{{ jupyterhub_venv }}"    # 2021-07-29: This works on RasPiOS 10, Debian 11, Ubuntu 20.04 and Mint 20 -- however if you absolutely must use the older Debian 10 -- you can work around errors "can't find Rust compiler" and "This package requires Rust >=1.41.0" if you (1) revert this line to 'virtualenv_command: virtualenv' AND (2) uncomment the line just below
+    virtualenv_command: python3 -m venv --system-site-packages "{{ jupyterhub_venv }}"    # 2021-07-29: This works on RasPiOS 10, Debian 11, Ubuntu 20.04 and Mint 20 -- however if you absolutely must use the older Debian 10 -- you can work around errors "can't find Rust compiler" and "This package requires Rust >=1.41.0" if you (1) revert this line to 'virtualenv_command: virtualenv' AND (2) uncomment the line just below
     #virtualenv_python: python3    # 2021-07-29: Was needed when above line was 'virtualenv_command: virtualenv' (generally for Python 2)
     extra_args: "--no-cache-dir"    # 2021-11-30, 2022-07-07: The "--pre" flag had earlier been needed, for beta-like pre-releases of JupyterHub 2.0.0
 
@@ -58,7 +63,7 @@
       - ipywidgets
     virtualenv: "{{ jupyterhub_venv }}"
     virtualenv_site_packages: no
-    virtualenv_command: python3 -m venv "{{ jupyterhub_venv }}"    
+    virtualenv_command: python3 -m venv --system-site-packages "{{ jupyterhub_venv }}"
     extra_args: "--no-cache-dir"
 
 - name: "Install from template: {{ jupyterhub_venv }}/etc/jupyterhub/jupyterhub_config.py"

roles/lokole/tasks/install.yml

@@ -2,12 +2,11 @@
 # https://github.com/iiab/iiab/blob/master/roles/www_base/templates/iiab-refresh-wiki-docs.sh#L51-L52
 
 
-- name: Install 13 packages for Lokole
+- name: Install 12 packages for Lokole
   apt:
     name:
       #- python3    # 2022-12-21: IIAB pre-req, see scripts/local_facts.fact
       #- python3-pip
-      - python3-venv
       - python3-dev
       - python3-bcrypt    # 2019-10-14: Should work across modern Linux OS's
       #- bcrypt does not exist on Ubuntu 19.10

roles/nodejs/tasks/install.yml

@@ -94,6 +94,12 @@
   #  warn: no
   #  creates: /etc/apt/sources.list.d/nodesource.list
 
+- name: Remove /etc/apt/sources.list.d/nodesource.list if install failed above
+  file:
+    path: /etc/apt/sources.list.d/nodesource.list
+    state: absent
+  when: curl_nodesource.failed
+
 - name: Install latest Node.js -- includes /usr/bin/npm if nodesource installed above
   package:
     #name: nodejs={{ nodejs_version }}