Repository: incubator-hawq
Updated Branches:
  refs/heads/master 17f555fb3 -> cf041ae07


HAWQ-1064. Additional work related to paramiko removal.

The python module paramiko was replaced with pexpect-4.2 &
ptyprocess-0.5.1. The following additional changes are needed:

* LICENSE file needs to be updated
* The references to paramiko need to be removed from tools/bin/Makefile & 
tools/bin/lib/.gitignore
* Remove additional unused entries in tools/bin/lib/.gitignore
* Remove additional unused entry in .travis.yml
* Minor fix to tools/Makefile (for Paul Guo).


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/1de45ef4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/1de45ef4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/1de45ef4

Branch: refs/heads/master
Commit: 1de45ef4fde79f27c03aeccc862854c30fecdd67
Parents: 17f555f
Author: Ed Espino <esp...@apache.org>
Authored: Tue Sep 20 13:12:00 2016 -0700
Committer: Ed Espino <esp...@apache.org>
Committed: Wed Sep 21 00:53:14 2016 -0700

----------------------------------------------------------------------
 .travis.yml                           |  2 +-
 LICENSE                               | 14 ++++++++++++--
 licenses/LICENSE-pexpect-4.2.txt      | 20 ++++++++++++++++++++
 licenses/LICENSE-ptyprocess-0.5.1.txt | 16 ++++++++++++++++
 tools/Makefile                        |  1 +
 tools/bin/Makefile                    | 12 ------------
 tools/bin/lib/.gitignore              |  7 -------
 7 files changed, 50 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1de45ef4/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 7e7c2aa..f6623a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ install:
   - brew outdated maven || brew upgrade maven
   - brew tap brona/iproute2mac
   - brew install iproute2mac
-  - sudo pip install pycrypto paramiko
+  - sudo pip install pycrypto
 
 before_script:
   - cd $TRAVIS_BUILD_DIR

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1de45ef4/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 20a5f42..42a8bdd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -425,12 +425,22 @@ Internet Systems Consortium/Internet Software Consortium 
(ISC) LICENSE
   The following files are used:
   
       src/backend/utils/adt/inet_net_ntop.c
-      src/backend/utils/adt/inet_net_pton.c 
+      src/backend/utils/adt/inet_net_pton.c
   
-  This file is made available under the following ISC license:
+  These files are made available under the following ISC license:
   
       licenses/LICENSE-isc.txt
 
+  The following components are provided under the ISC license. See
+  project link for details.  The text of each license is also included
+  at licenses/LICENSE-[project].txt.
+
+     pexpect-4.2 (https://pypi.python.org/pypi/pexpect/4.2.0)
+       tools/bin/pythonSrc/pexpect-4.2
+
+     ptyprocess-0.5.1 (https://pypi.python.org/pypi/ptyprocess/0.5.1)
+       tools/bin/pythonSrc/ptyprocess-0.5.1
+
 ======================================================================
 regex LICENSE
 ======================================================================

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1de45ef4/licenses/LICENSE-pexpect-4.2.txt
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-pexpect-4.2.txt b/licenses/LICENSE-pexpect-4.2.txt
new file mode 100644
index 0000000..754db5a
--- /dev/null
+++ b/licenses/LICENSE-pexpect-4.2.txt
@@ -0,0 +1,20 @@
+ISC LICENSE
+
+    This license is approved by the OSI and FSF as GPL-compatible.
+        http://opensource.org/licenses/isc-license.txt
+
+    Copyright (c) 2013-2014, Pexpect development team
+    Copyright (c) 2012, Noah Spurrier <n...@noah.org>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose with or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+    
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+    MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1de45ef4/licenses/LICENSE-ptyprocess-0.5.1.txt
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-ptyprocess-0.5.1.txt 
b/licenses/LICENSE-ptyprocess-0.5.1.txt
new file mode 100644
index 0000000..9c77274
--- /dev/null
+++ b/licenses/LICENSE-ptyprocess-0.5.1.txt
@@ -0,0 +1,16 @@
+Ptyprocess is under the ISC license, as code derived from Pexpect.
+    http://opensource.org/licenses/ISC
+
+Copyright (c) 2013-2014, Pexpect development team
+Copyright (c) 2012, Noah Spurrier <n...@noah.org>
+
+PERMISSION TO USE, COPY, MODIFY, AND/OR DISTRIBUTE THIS SOFTWARE FOR ANY 
PURPOSE
+WITH OR WITHOUT FEE IS HEREBY GRANTED, PROVIDED THAT THE ABOVE COPYRIGHT NOTICE
+AND THIS PERMISSION NOTICE APPEAR IN ALL COPIES. THE SOFTWARE IS PROVIDED
+"AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT
+SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1de45ef4/tools/Makefile
----------------------------------------------------------------------
diff --git a/tools/Makefile b/tools/Makefile
index 172f6f6..3eb49f6 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -27,6 +27,7 @@ include $(top_builddir)/src/Makefile.global
 
 all:
        ${MAKE} -C gpnetbench $@
+       ${MAKE} -C bin $@
 
 install :
        ${MAKE} -C bin $@

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1de45ef4/tools/bin/Makefile
----------------------------------------------------------------------
diff --git a/tools/bin/Makefile b/tools/bin/Makefile
index c25a822..754730a 100644
--- a/tools/bin/Makefile
+++ b/tools/bin/Makefile
@@ -136,18 +136,6 @@ unittest2:
        cd $(PYLIB_SRC)/$(UNITTEST2_DIR)/ && python setup.py build
        cp -r $(PYLIB_SRC)/$(UNITTEST2_DIR)/build/lib/unittest2  $(PYLIB_DIR)/
 
-#
-# PARAMIKO
-#
-PARAMIKO_VERSION=1.7.6-9
-PARAMIKO_DIR=paramiko-$(PARAMIKO_VERSION)
-paramiko:
-       @echo "--- paramiko"
-       cd $(PYLIB_SRC)/ && $(TAR) xzf $(PARAMIKO_DIR).tar.gz
-       cd $(PYLIB_SRC)/$(PARAMIKO_DIR)/ && python setup.py build
-       cp -r $(PYLIB_SRC)/$(PARAMIKO_DIR)/build/lib/paramiko  $(PYLIB_DIR)/
-
-
 PYTHON_FILES=`grep -l --exclude=Makefile --exclude=gplogfilter 
--exclude=gpcheckos --exclude=gpgenfsmap.py --exclude=throttlingD.py "/bin/env 
python" *`\
                         `grep -l "/bin/env python" $(SRC)/../sbin/*`\
                         `find ./gppylib -name "*.py"`\

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1de45ef4/tools/bin/lib/.gitignore
----------------------------------------------------------------------
diff --git a/tools/bin/lib/.gitignore b/tools/bin/lib/.gitignore
index d8b8091..eac9b41 100644
--- a/tools/bin/lib/.gitignore
+++ b/tools/bin/lib/.gitignore
@@ -1,8 +1 @@
-netperf
-netserver
 stream
-Crypto
-paramiko
-stream
-Crypto
-paramiko

Reply via email to