From 9347aab24740c8595abdb5b25dd233dfa3127a4f Mon Sep 17 00:00:00 2001 From: Ee Durbin Date: Tue, 12 Apr 2022 09:16:14 -0400 Subject: [PATCH 1/2] add deadsnakes and install python3.10 for docs.nyc1.psf.io --- salt/docs/init.sls | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/salt/docs/init.sls b/salt/docs/init.sls index 5eb3575b..9f1cfb42 100644 --- a/salt/docs/init.sls +++ b/salt/docs/init.sls @@ -1,6 +1,10 @@ include: - nginx +deadsnakes-ppa: + pkgrepo.managed: + - ppa: deadsnakes/ppa + # Various packages required for building documentation. doc-pkgs: pkg.installed: @@ -12,6 +16,8 @@ doc-pkgs: - python-dev - python-virtualenv - python3-venv + - python3.10-dev + - python3.10-venv - latexmk - texinfo - texlive From e007116664cc1c6fcc285b810c91d56213bb0f48 Mon Sep 17 00:00:00 2001 From: Ee Durbin Date: Tue, 12 Apr 2022 09:25:37 -0400 Subject: [PATCH 2/2] mdk will need to recreate the venv by hand, but it will be reconstructed in a DR scenario --- salt/docs/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/docs/init.sls b/salt/docs/init.sls index 9f1cfb42..da9a9ed0 100644 --- a/salt/docs/init.sls +++ b/salt/docs/init.sls @@ -50,7 +50,7 @@ docsbuild-scripts: virtualenv: cmd.run: - runas: docsbuild - - name: 'python3.6 -m venv --without-pip /srv/docsbuild/venv' + - name: 'python3.10 -m venv --without-pip /srv/docsbuild/venv' - creates: /srv/docsbuild/venv/bin/python - require: - pkg: doc-pkgs