This is an automated email from the ASF dual-hosted git repository.
sekikn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new f82d6fd BIGTOP-3336. Fix Livy build on CentOS and Fedora (#625)
f82d6fd is described below
commit f82d6fd9c568ea4741c723a5a452617fd3aa1551
Author: Kengo Seki <[email protected]>
AuthorDate: Fri Apr 10 23:10:00 2020 +0900
BIGTOP-3336. Fix Livy build on CentOS and Fedora (#625)
---
.../livy/patch0-python-executable-version.diff | 22 ++++++++++++++++++++++
bigtop_toolchain/manifests/packages.pp | 2 +-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git
a/bigtop-packages/src/common/livy/patch0-python-executable-version.diff
b/bigtop-packages/src/common/livy/patch0-python-executable-version.diff
new file mode 100644
index 0000000..603c58e
--- /dev/null
+++ b/bigtop-packages/src/common/livy/patch0-python-executable-version.diff
@@ -0,0 +1,22 @@
+diff --git a/python-api/pom.xml b/python-api/pom.xml
+index 8e5cdab..f042e73 100644
+--- a/python-api/pom.xml
++++ b/python-api/pom.xml
+@@ -46,7 +46,7 @@
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+- <executable>python</executable>
++ <executable>python2</executable>
+ <arguments>
+ <argument>setup.py</argument>
+ <argument>sdist</argument>
+@@ -60,7 +60,7 @@
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+- <executable>python</executable>
++ <executable>python2</executable>
+ <skip>${skipTests}</skip>
+ <arguments>
+ <argument>setup.py</argument>
diff --git a/bigtop_toolchain/manifests/packages.pp
b/bigtop_toolchain/manifests/packages.pp
index 2cde408..93704c3 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -256,7 +256,7 @@ class bigtop_toolchain::packages {
provider => 'pip',
require => [ Package[$pip], File['/usr/bin/pip-python'] ]
}
- package { 'flake8':
+ package { ['flake8', 'wheel']:
ensure => 'installed',
provider => 'pip',
require => [ Package[$pip], File['/usr/bin/pip-python'] ]