Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/236762
Change subject: toollabs: remove duplicate python packages
......................................................................
toollabs: remove duplicate python packages
- remove socketio-client from genpp (installed via aptly)
- python3-scipy is installed via genpp
Change-Id: Ib058e96e86a8483a78ea67134c37f6e5ecfc22bc
---
M modules/toollabs/manifests/exec_environ.pp
M modules/toollabs/manifests/genpp/python.py
M modules/toollabs/manifests/genpp/python_exec_jessie.pp
M modules/toollabs/manifests/genpp/python_exec_precise.pp
M modules/toollabs/manifests/genpp/python_exec_trusty.pp
M modules/toollabs/manifests/genpp/report-python.html
6 files changed, 1 insertion(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/236762/1
diff --git a/modules/toollabs/manifests/exec_environ.pp
b/modules/toollabs/manifests/exec_environ.pp
index 0406ad4..c12305d 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -353,7 +353,6 @@
'mariadb-client', # For /usr/bin/mysql, is broken on
precise atm
'python-flake8',
'python3-flake8',
- 'python3-scipy', # T103136
'tcl-thread',
]:
ensure => latest,
diff --git a/modules/toollabs/manifests/genpp/python.py
b/modules/toollabs/manifests/genpp/python.py
index b650a5b..a48b6e3 100755
--- a/modules/toollabs/manifests/genpp/python.py
+++ b/modules/toollabs/manifests/genpp/python.py
@@ -51,8 +51,7 @@
'pyinotify', # T59003
'requests',
'rsvg', # T58996
- 'scipy',
- 'socketio-client', # T86015
+ 'scipy', # T103136
'sqlalchemy',
'svn', # T58996
'twisted',
diff --git a/modules/toollabs/manifests/genpp/python_exec_jessie.pp
b/modules/toollabs/manifests/genpp/python_exec_jessie.pp
index 3589b97..8993757 100644
--- a/modules/toollabs/manifests/genpp/python_exec_jessie.pp
+++ b/modules/toollabs/manifests/genpp/python_exec_jessie.pp
@@ -97,8 +97,6 @@
# python3-rsvg is not available
'python-scipy', # 0.14.0
'python3-scipy', # 0.14.0
- 'python-socketio-client', # 0.5.3
- # python3-socketio-client is not available
'python-sqlalchemy', # 0.9.8
'python3-sqlalchemy', # 0.9.8
'python-svn', # 1.7.8
diff --git a/modules/toollabs/manifests/genpp/python_exec_precise.pp
b/modules/toollabs/manifests/genpp/python_exec_precise.pp
index 3886c0c..2da4818 100644
--- a/modules/toollabs/manifests/genpp/python_exec_precise.pp
+++ b/modules/toollabs/manifests/genpp/python_exec_precise.pp
@@ -97,8 +97,6 @@
# python3-rsvg is not available
'python-scipy', # 0.9.0
'python3-scipy', # 0.9.0
- # python-socketio-client is not available
- # python3-socketio-client is not available
'python-sqlalchemy', # 0.7.4
'python3-sqlalchemy', # 0.7.4
'python-svn', # 1.7.5
diff --git a/modules/toollabs/manifests/genpp/python_exec_trusty.pp
b/modules/toollabs/manifests/genpp/python_exec_trusty.pp
index d88e9d9..e43370b 100644
--- a/modules/toollabs/manifests/genpp/python_exec_trusty.pp
+++ b/modules/toollabs/manifests/genpp/python_exec_trusty.pp
@@ -97,8 +97,6 @@
# python3-rsvg is not available
'python-scipy', # 0.13.3
'python3-scipy', # 0.13.3
- # python-socketio-client is not available
- # python3-socketio-client is not available
'python-sqlalchemy', # 0.8.4
'python3-sqlalchemy', # 0.8.4
'python-svn', # 1.7.8
diff --git a/modules/toollabs/manifests/genpp/report-python.html
b/modules/toollabs/manifests/genpp/report-python.html
index 1baae18..7c32c57 100644
--- a/modules/toollabs/manifests/genpp/report-python.html
+++ b/modules/toollabs/manifests/genpp/report-python.html
@@ -106,8 +106,6 @@
<tr><th>python3-rsvg</th><td></td><td></td><td></td></tr>
<tr><th>python-scipy</th><td>0.9.0</td><td>0.13.3</td><td>0.14.0</td></tr>
<tr><th>python3-scipy</th><td>0.9.0</td><td>0.13.3</td><td>0.14.0</td></tr>
-<tr><th>python-socketio-client</th><td></td><td></td><td>0.5.3</td></tr>
-<tr><th>python3-socketio-client</th><td></td><td></td><td></td></tr>
<tr><th>python-sqlalchemy</th><td>0.7.4</td><td>0.8.4</td><td>0.9.8</td></tr>
<tr><th>python3-sqlalchemy</th><td>0.7.4</td><td>0.8.4</td><td>0.9.8</td></tr>
<tr><th>python-svn</th><td>1.7.5</td><td>1.7.8</td><td>1.7.8</td></tr>
--
To view, visit https://gerrit.wikimedia.org/r/236762
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib058e96e86a8483a78ea67134c37f6e5ecfc22bc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Merlijn van Deen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
