Skip to content
This repository has been archived by the owner on Jul 4, 2023. It is now read-only.

Hue #40150

Closed
wants to merge 11 commits into from
Closed

Hue #40150

Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c555f5c
adding a formula for Hue, the Hadoop User Experience web application
c6stephens May 28, 2015
7be40f8
changes based on 'brew audit'
c6stephens May 28, 2015
375b934
replaced comma missing 'cp' command with 'install'. removed ohai mes…
c6stephens May 28, 2015
5753a26
fixed style and --strict audit issues. won't change OpenSSL dependenc…
c6stephens May 28, 2015
12cec72
made dependency on Homebrew's latest OpenSSL the default, with overri…
Jun 1, 2015
3f48634
fix issues brought up by 'brew audit --strict'
Jul 15, 2015
25276fb
additional strict audit item found after 'brew update'
Jul 15, 2015
74acf9b
removed option to install with system OpenSSL; removed 'tablib' setup…
Jul 20, 2015
a1dc5dd
removed patch for installation directory and changed make PREFIX to l…
Jul 26, 2015
162547e
fixed trailing whitespace so 'brew audit --strict' won't complain
Jul 26, 2015
a6b5230
switching patches from inline data to upstream pull request patch fil…
Aug 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
172 changes: 172 additions & 0 deletions Library/Formula/hue.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
class Hue < Formula
desc "Hue is a Web interface for analyzing data with Apache Hadoop."
homepage "http://gethue.com/"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use https:// here.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point but gethue.com does not have https yet, it will break the page on modern browsers

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right it breaks the page.

url "https://github.com/cloudera/hue/archive/release-3.8.1.tar.gz"
sha256 "582777f567b9f4a34e4ce58cfd5ed24aff15f3e02f193e7990329d8cb0161a8a"

option "with-system-openssl", "Build with the Mac OS system OpenSSL instead of the (more secure) latest Homebrew version"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't support this option in the core. It must use Homebrew's OpenSSL.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed option to install with system OpenSSL.


depends_on :java
depends_on :mysql

depends_on "gmp"
depends_on "maven" => :build
depends_on "openssl" if build.without? "system-openssl"

patch :DATA
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please submit this patch to the upstream developers of this project and add a link to the upstream patch submission and explanation of why the patch is needed in a comment in the formula file. Thanks!


def install
ENV.append_to_cflags "-I" + `xcrun --show-sdk-path`.strip + "/usr/include/sasl" if MacOS.version >= :mavericks
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interpolate the string here, thanks.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also you can get this from the Xcode module instead.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call! Used the "#{MacOS.sdk_path}" variable instead.

ENV.deparallelize
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please file an upstream issue about this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ping on this.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MikeMcQuaid Just to make sure I understood which line you are referring to - are you asking if I can file an upstream issue on the build not working in parallel?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, please.


# patched the Makefile vars to install to ${PREFIX}/libexec
system "make", "install", "PREFIX=#{prefix}", "SKIP_PYTHONDEV_CHECK=1"

(libexec/"desktop/conf").install "desktop/conf.dist/hue.ini"
etc.install_symlink "#{libexec}/desktop/conf/hue.ini"

bin.install_symlink "#{libexec}/build/env/bin/hue"
end

test do
fork do
system "#{bin}/hue", "runserver"
end
sleep(6)

begin
system "curl", "-s", "-S", "-f", "-L", "http://localhost:8000"
assert_equal 0, $?.exitstatus
ensure
sleep(2)
system "pkill", "-f", "hue"
end
end
end
__END__
diff --git a/desktop/core/ext-py/tablib-develop/setup.py b/desktop/core/ext-py/tablib-develop/setup.py
index fb16546..6f3bcfe 100755
--- a/desktop/core/ext-py/tablib-develop/setup.py
+++ b/desktop/core/ext-py/tablib-develop/setup.py
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this patch necessary and has it been submitted upstream?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would Hue need this or a rebase on latest tablib? (that way you don't need this here)

@@ -36,36 +36,46 @@ if sys.argv[-1] == 'test':
os.system('py.test test_tablib.py')
sys.exit()

-setup(
- name='tablib',
- version=tablib.__version__,
- description='Format agnostic tabular data library (XLS, JSON, YAML, CSV)',
- long_description=(open('README.rst').read() + '\n\n' +
- open('HISTORY.rst').read()),
- author='Kenneth Reitz',
- author_email='[email protected]',
- url='http://python-tablib.org',
- packages=[
- 'tablib', 'tablib.formats',
- 'tablib.packages',
+packages = [
+ 'tablib', 'tablib.formats',
+ 'tablib.packages',
+ 'tablib.packages.omnijson',
+ 'tablib.packages.unicodecsv'
+]
+
+if sys.version_info[0] == 2:
+ packages.extend([
'tablib.packages.xlwt',
- 'tablib.packages.xlwt3',
'tablib.packages.xlrd',
- 'tablib.packages.xlrd3',
- 'tablib.packages.omnijson',
'tablib.packages.odf',
- 'tablib.packages.odf3',
'tablib.packages.openpyxl',
'tablib.packages.openpyxl.shared',
'tablib.packages.openpyxl.reader',
'tablib.packages.openpyxl.writer',
+ 'tablib.packages.yaml'
+ ])
+else:
+ packages.extend([
+ 'tablib.packages.xlwt3',
+ 'tablib.packages.xlrd3',
+ 'tablib.packages.odf3',
'tablib.packages.openpyxl3',
'tablib.packages.openpyxl3.shared',
'tablib.packages.openpyxl3.reader',
'tablib.packages.openpyxl3.writer',
- 'tablib.packages.yaml',
- 'tablib.packages.unicodecsv'
- ],
+ 'tablib.packages.yaml3'
+ ])
+
+setup(
+ name='tablib',
+ version=tablib.__version__,
+ description='Format agnostic tabular data library (XLS, JSON, YAML, CSV)',
+ long_description=(open('README.rst').read() + '\n\n' +
+ open('HISTORY.rst').read()),
+ author='Kenneth Reitz',
+ author_email='[email protected]',
+ url='http://python-tablib.org',
+ packages=packages,
license='MIT',
classifiers=(
'Development Status :: 5 - Production/Stable',

diff --git a/desktop/core/ext-py/parquet-python/parquet/bitstring.py b/desktop/core/ext-py/parquet-python/parquet/bitstring.py
index ab807a2..7203c94 100644
--- a/desktop/core/ext-py/parquet-python/parquet/bitstring.py
+++ b/desktop/core/ext-py/parquet-python/parquet/bitstring.py
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same question here.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Patch has been submitted upstream.

@@ -1,7 +1,5 @@
-
SINGLE_BIT_MASK = [1 << x for x in range(7, -1, -1)]

-]

class BitString(object):

@@ -10,7 +8,6 @@ class BitString(object):
self.offset = offset if offset is not None else 0
self.length = length if length is not None else 8 * len(data) - self.offset

-
def __getitem__(self, key):
try:
start = key.start
@@ -18,5 +15,5 @@ class BitString(object):
except AttributeError:
if key < 0 or key >= length:
raise IndexError()
- byte_index, bit_offset = divmod(self.offset + key), 8)
- return self.bytes[byte_index] & SINGLE_BIT_MASK[bit_offset]
\ No newline at end of file
+ byte_index, bit_offset = (divmod(self.offset + key), 8)
+ return self.bytes[byte_index] & SINGLE_BIT_MASK[bit_offset]
diff --git a/desktop/core/ext-py/pyopenssl/OpenSSL/crypto/crl.c b/desktop/core/ext-py/pyopenssl/OpenSSL/crypto/crl.c
index eec5bcb..b2fd681 100644
--- a/desktop/core/ext-py/pyopenssl/OpenSSL/crypto/crl.c
+++ b/desktop/core/ext-py/pyopenssl/OpenSSL/crypto/crl.c
@@ -3,7 +3,7 @@
#include "crypto.h"


-static X509_REVOKED * X509_REVOKED_dup(X509_REVOKED *orig) {
+X509_REVOKED * X509_REVOKED_dup(X509_REVOKED *orig) {
X509_REVOKED *dupe = NULL;

dupe = X509_REVOKED_new();
diff --git a/Makefile.vars.priv b/Makefile.vars.priv
index 79bc443..e17e192 100644
--- a/Makefile.vars.priv
+++ b/Makefile.vars.priv
@@ -53,7 +53,7 @@ BLD_DIR_DOC := $(BLD_DIR)/docs

# Installation directory
PREFIX ?= /usr/local
-INSTALL_DIR ?= $(PREFIX)/hue
+INSTALL_DIR ?= $(PREFIX)/libexec
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you could pass this on the command line instead of patching, i.e. make install PREFIX=#{prefix} INSTALL_DIR=#{prefix}/libexec.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that was the first thing I tried. When I set INSTALL_DIR from the command line, I get the following error when the first Hue web submodule is installed:

--- Making built distribution at /private/tmp/hue20150531-47630-1au188t/hue-release-3.8.1/desktop/core/build/bdist/desktop-3.8.1
--- Install built distribution for desktop at /usr/local/Cellar/hue/3.8.1/libexec
ERROR: /usr/local/Cellar/hue/3.8.1/libexec not empty. Cowardly refusing to continue.
make[2]: *** [install-bdist] Error 1
make[1]: *** [.recursive-install-bdist/core] Error 2
make: *** [install-desktop] Error 2

It looks like this is happening inside this target:

https://github.com/cloudera/hue/blob/master/Makefile.sdk#L245

So, I'd need to patch anyways.

I'm going to open an issue with Hue. For now, patching the INSTALL_DIR variable instead of setting it on the command line works fine.

INSTALL_APPS_DIR ?= $(INSTALL_DIR)/desktop/apps

ifeq ($(INSTALL_DIR),$(patsubst /%,%,$(INSTALL_DIR)))