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

Commit

Permalink
HAWQ-1064. Additional work related to paramiko removal.
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
edespino committed Sep 21, 2016
1 parent 17f555f commit 1de45ef
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 12 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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
======================================================================
Expand Down
20 changes: 20 additions & 0 deletions licenses/LICENSE-pexpect-4.2.txt
Original file line number Diff line number Diff line change
@@ -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 <noah@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.

16 changes: 16 additions & 0 deletions licenses/LICENSE-ptyprocess-0.5.1.txt
Original file line number Diff line number Diff line change
@@ -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 <noah@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.

1 change: 1 addition & 0 deletions tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ include $(top_builddir)/src/Makefile.global

all:
${MAKE} -C gpnetbench $@
${MAKE} -C bin $@

install :
${MAKE} -C bin $@
Expand Down
12 changes: 0 additions & 12 deletions tools/bin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"`\
Expand Down
7 changes: 0 additions & 7 deletions tools/bin/lib/.gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
netperf
netserver
stream
Crypto
paramiko
stream
Crypto
paramiko

0 comments on commit 1de45ef

Please sign in to comment.