Mobrovac has submitted this change and it was merged.
Change subject: gitupdate - pip install in editable mode, remove no longer
needed manual eventlogging depenency install
......................................................................
gitupdate - pip install in editable mode, remove no longer needed manual
eventlogging depenency install
Change-Id: I5f45c185c1ae4eea7ca4c5d259174e7bc3090634
---
M puppet/modules/eventlogging/manifests/init.pp
M puppet/modules/service/manifests/gitupdate.pp
2 files changed, 7 insertions(+), 25 deletions(-)
Approvals:
Mobrovac: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/eventlogging/manifests/init.pp
b/puppet/modules/eventlogging/manifests/init.pp
index 04e44b4..32f64bb 100644
--- a/puppet/modules/eventlogging/manifests/init.pp
+++ b/puppet/modules/eventlogging/manifests/init.pp
@@ -17,35 +17,14 @@
require_package('libmysqlclient-dev')
- # These packages aren't currently satisfied by eventlogging's
- # setup.py due to Trusty vs. Jessie issues. This will
- # be remedied when WMF eventlogging production deployment is fixed.
- # See: https://github.com/wikimedia/eventlogging/blob/master/setup.py#L60
- Virtualenv::Package {
- path => "${path}/virtualenv",
- require => Service::Gitupdate['eventlogging'],
- }
-
- virtualenv::package { 'etcd': }
- virtualenv::package { 'tornado': }
- virtualenv::package { 'sprockets.mixins.statsd': }
- # mysqlclient pip package installs a python module called MySQLdb.
- virtualenv::package { 'mysqlclient':
- python_module => 'MySQLdb',
- require => Package['libmysqlclient-dev'],
- }
-
# Do the initial pip install into the virtualenv
exec { 'eventlogging_virtualenv_pip_install':
- command => "${path}/virtualenv/bin/pip install .",
+ command => "${path}/virtualenv/bin/pip install -e .",
cwd => $path,
- creates =>
"${path}/virtualenv/local/lib/python2.7/site-packages/eventlogging",
+ creates =>
"${path}/virtualenv/local/lib/python2.7/site-packages/eventlogging.egg-link",
require => [
Service::Gitupdate['eventlogging'],
- Virtualenv::Package['etcd'],
- Virtualenv::Package['tornado'],
- Virtualenv::Package['sprockets.mixins.statsd'],
- Virtualenv::Package['mysqlclient'],
+ Package['libmysqlclient-dev']
],
}
}
diff --git a/puppet/modules/service/manifests/gitupdate.pp
b/puppet/modules/service/manifests/gitupdate.pp
index 8f31b71..c37de45 100644
--- a/puppet/modules/service/manifests/gitupdate.pp
+++ b/puppet/modules/service/manifests/gitupdate.pp
@@ -19,6 +19,9 @@
# The type of the service, can be 'php', 'nodejs' or 'python'.
# This parameter is relevant only if a dependencies update should be
# scheduled as well (cf. the 'update' parameter below). Default: undef
+# NOTE: python packages are installed into a virtualenv in 'editible'
+# mode. That is, you can edit their checked out locations and still
+# see the effects in code run out of the virtualenv.
#
# [*pull*]
# Whether to perform a git pull. Default: true
@@ -84,7 +87,7 @@
$up_cmd = $type ? {
'php' => 'composer update --no-interaction --optimize-autoloader',
'nodejs' => 'sudo rm -rf node_modules && npm install --no-bin-links',
- 'python' => './virtualenv/bin/pip install .',
+ 'python' => './virtualenv/bin/pip install -e .',
default => 'invalid'
}
if $update and $up_cmd == 'invalid' {
--
To view, visit https://gerrit.wikimedia.org/r/281949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5f45c185c1ae4eea7ca4c5d259174e7bc3090634
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
