Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394654 )
Change subject: Less snowflaky installation for pylru and redis packages
......................................................................
Less snowflaky installation for pylru and redis packages
Bug: T181850
Change-Id: I57a48e748cb8d37ea2cc92597e42d800484cbe59
---
M puppet/modules/ores/manifests/init.pp
1 file changed, 8 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/54/394654/1
diff --git a/puppet/modules/ores/manifests/init.pp
b/puppet/modules/ores/manifests/init.pp
index 089d08d..f9c8828 100644
--- a/puppet/modules/ores/manifests/init.pp
+++ b/puppet/modules/ores/manifests/init.pp
@@ -28,24 +28,20 @@
# ORES (in a venv as it needs Python 3)
virtualenv::environment { $deploy_dir:
- ensure => present,
- owner => $::share_owner,
- group => $::share_group,
- python => 'python3',
+ ensure => present,
+ owner => $::share_owner,
+ group => $::share_group,
+ python => 'python3',
+ packages => [
+ 'pylru',
+ 'redis',
+ ],
require => Package['python3-dev', 'g++', 'gfortran', 'liblapack-dev',
'libopenblas-dev', 'libenchant-dev'],
}
virtualenv::package { 'ores':
package => 'git+https://github.com/wiki-ai/ores.git#egg=ores',
path => $deploy_dir,
editable => true,
- }
- #FIXME this should happen as part of normal dependency management but for
some reason it doesn't
- # pylru probably needs to be fixed in the revscoring pakcage, redis in ores
- exec { 'pip_install_revscoring_dependencies_hack':
- command => "curl
https://raw.githubusercontent.com/wiki-ai/revscoring/master/requirements.txt |
${deploy_dir}/bin/pip install pylru redis -r /dev/stdin",
- cwd => $deploy_dir,
- subscribe => Virtualenv::Package['ores'],
- refreshonly => true,
}
$repo_dir = "${deploy_dir}/src/ores"
@@ -66,7 +62,6 @@
require => [
VirtualEnv::Package['ores'],
Class['mediawiki::ready_service'],
- Exec['pip_install_revscoring_dependencies_hack'],
Apache::Site['ores'],
],
subscribe => [
@@ -80,7 +75,6 @@
require => [
VirtualEnv::Package['ores'],
Class['mediawiki::ready_service'],
- Exec['pip_install_revscoring_dependencies_hack'],
Apache::Site['ores'],
],
subscribe => [
--
To view, visit https://gerrit.wikimedia.org/r/394654
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I57a48e748cb8d37ea2cc92597e42d800484cbe59
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
