Merge pull request #9796 from alphagov/python3

Ensure Python 3 is installed
alphagov · Nov 6, 2019 · 0aa821b · 0aa821b
2 parents c928eeb + 78566c5
commit 0aa821b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/modules/govuk/manifests/node/s_mapit.pp b/modules/govuk/manifests/node/s_mapit.pp
@@ -18,6 +18,8 @@
   ->
   class { 'govuk_postgresql::server::standalone': }
 
+  include govuk_python
+
   include collectd::plugin::memcached
   class { 'memcached':
     max_memory => '12%',

diff --git a/modules/govuk_ci/manifests/agent.pp b/modules/govuk_ci/manifests/agent.pp
@@ -43,6 +43,7 @@
   include ::govuk_jenkins::pipeline
   include ::govuk_jenkins::user
   include ::govuk_rbenv::all
+  include ::govuk_python
   include ::govuk_sysdig
   include ::govuk_testing_tools
   include ::yarn
@@ -65,7 +66,6 @@
   $deb_packages = [
     'jq',
     'libfreetype6-dev', # govuk-taxonomy-supervised-learning
-    'python3-dev', # govuk-taxonomy-supervised-learning
     'shellcheck',
   ]
 

diff --git a/modules/govuk_python/manifests/init.pp b/modules/govuk_python/manifests/init.pp
@@ -8,4 +8,6 @@
   }
 
   Class['python::install'] -> Package <| provider == 'pip' and ensure != absent |>
+
+  ensure_packages(['python3', 'python3-dev', 'python3-venv'])
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,6 @@ @@
       }
       Class['python::install'] -> Package <| provider == 'pip' and ensure != absent |>
+      ensure_packages(['python3', 'python3-dev', 'python3-venv'])
     }