Volans has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368616 )
Change subject: contint: upgrade tox
......................................................................
contint: upgrade tox
The python jobs are solely on Jessie, bring in tox 2.5.0 from
jessie-backports.
Bug: T169602
Change-Id: I296d1bc040b0a1ebf50410e4895fec15d486dc48
---
M modules/contint/manifests/packages/python.pp
1 file changed, 13 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Volans: Looks good to me, approved
diff --git a/modules/contint/manifests/packages/python.pp
b/modules/contint/manifests/packages/python.pp
index 415d1c6..756982b 100644
--- a/modules/contint/manifests/packages/python.pp
+++ b/modules/contint/manifests/packages/python.pp
@@ -28,19 +28,26 @@
require_package('librdkafka-dev') # For confluent-kafka
}
- # Bring in fresh pip. The Trusty package does not provide wheels cache
- # https://pip.pypa.io/en/latest/news.html
+ # Bring in fresh pip. The Trusty or Jessie packages do not provide wheels
+ # cache https://pip.pypa.io/en/latest/news.html
package { 'pip':
ensure => '8.1.2',
provider => 'pip',
require => Package['python-pip'], # eggs and chicken
}
- # Bring tox/virtualenv... from pip T46443
+ if os_version( 'debian == jessie' ) {
+ apt::pin { 'python-tox':
+ pin => 'release a=jessie-backports',
+ priority => '1001',
+ before => Package['tox'],
+ require => Package['pip'],
+ }
+ }
+
package { 'tox':
- ensure => '1.9.2',
- provider => 'pip',
- require => Package['pip'], # Fresh pip version
+ ensure => present,
+ require => Package['pip'],
}
# 'pip install pip' deletes /usr/bin/pip :(
--
To view, visit https://gerrit.wikimedia.org/r/368616
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I296d1bc040b0a1ebf50410e4895fec15d486dc48
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
