Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108224
Change subject: Add python::* classes accidentally omitted from 1d92fb85c5
......................................................................
Add python::* classes accidentally omitted from 1d92fb85c5
Follows I575809a87.
Change-Id: I6c1c81aedebed4ba4338bd6cb012e378a5c9884b
---
A puppet/modules/python/manifests/dev.pp
A puppet/modules/python/manifests/pil.pp
2 files changed, 36 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/24/108224/1
diff --git a/puppet/modules/python/manifests/dev.pp
b/puppet/modules/python/manifests/dev.pp
new file mode 100644
index 0000000..648f747
--- /dev/null
+++ b/puppet/modules/python/manifests/dev.pp
@@ -0,0 +1,8 @@
+# == Class: python::dev
+#
+# This includable class provides an easy way for classes to expresses a
+# dependency on python-dev without causing duplicate definition errors.
+#
+class python::dev {
+ package { 'python-dev': }
+}
diff --git a/puppet/modules/python/manifests/pil.pp
b/puppet/modules/python/manifests/pil.pp
new file mode 100644
index 0000000..3c787eb
--- /dev/null
+++ b/puppet/modules/python/manifests/pil.pp
@@ -0,0 +1,28 @@
+# == Class: python::pil
+#
+# The Python Imaging Library (PIL) adds image processing capabilities to your
+# Python interpreter. This library supports many file formats, and provides
+# powerful image processing and graphics capabilities.
+#
+class python::pil {
+ include ::python::dev
+
+ package { 'zlib1g-dev': }
+
+ # Workaround for 'pip install pil' failing to find libz.so and thus
+ # installing without zlib support. See <http://goo.gl/eWJc24>.
+ file { '/usr/lib/libz.so':
+ ensure => link,
+ target => "/usr/lib/${::hardwaremodel}-linux-gnu/libz.so",
+ require => Package['zlib1g-dev'],
+ }
+
+ package { 'PIL':
+ ensure => '1.1.7',
+ provider => 'pip',
+ require => [
+ Package['python-dev', 'zlib1g-dev'],
+ File['/usr/lib/libz.so'],
+ ],
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/108224
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c1c81aedebed4ba4338bd6cb012e378a5c9884b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
