diff --git a/.travis.yml b/.travis.yml index b19d7775abf189261057cb0a329c58542523c86c..82457df2d47c4177f080605c72db595727f791f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ branches: install: - sudo apt-get update > /dev/null - - sudo apt-get -q install binutils-dev python-daemon python-yaml python-pexpect + - sudo apt-get -q install binutils-dev python-daemon python-yaml script: - mkdir ./build && cd ./build && cmake .. -DCMAKE_BUILD_TYPE=RelWithDebugInfo diff --git a/README.CentOS b/README.CentOS index b51aa54e3518ca501517fab7893ed11e9bc8cfc5..3536ce663288c30cb9e1d9b01ee7658d71074e61 100644 --- a/README.CentOS +++ b/README.CentOS @@ -33,10 +33,6 @@ CC=gcc463 CXX=g++463 cmake . -DCMAKE_BUILD_TYPE=RelWithDebugInfo -DENABLE_CLIENT sudo yum install python26 python26-PyYAML python26-argparse -wget http://pypi.python.org/packages/source/p/pexpect-u/pexpect-u-2.5.1.tar.gz#md5=7c916a9f42d636ec6aec39f7cdd96eb5 -tar -xzvf pexpect-u-2.5.1.tar.gz -sudo python26 setup.py install - wget http://pypi.python.org/packages/source/d/daemon/daemon-1.0.tar.gz#md5=b0bebffc51965a66ec4a4bc1006fa90b tar -xzvf daemon-1.0.tar.gz sudo python26 setup.py install diff --git a/README.FreeBSD b/README.FreeBSD index bea04cd930a71a2272a2b7cfa1cda9cc85d3adbc..b0c707abbee400e14be3dc3b5b079ee253395222 100644 --- a/README.FreeBSD +++ b/README.FreeBSD @@ -17,9 +17,6 @@ pkg_add -r python27 3. Install necessary python modules: ------------- -cd /usr/ports/misc/py-pexpect -sudo make install - cd /usr/ports/devel/py-yaml sudo make install diff --git a/README.md b/README.md index 4d23aa005bbaed2c2b442358cd92beb93c6d1726..1a9498e35c5c320ffe878a6b6919ace4ec373fd9 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,6 @@ simplest way to setup and start the server, but it requires a few additional Python modules: * daemon * pyyaml - * pexpect Once all prerequisites are installed, try: diff --git a/debian/control b/debian/control index a14e89041b0b6550406d9550598c4cd6f835b2e7..d4b50aebaacd4054b11e58b6f600eeb086f71aab 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Build-Depends: cdbs, debhelper (>= 8), libreadline-dev, python-yaml, python-daemon, - python-pexpect, libncurses5-dev, binutils-dev (< 2.23) | libiberty-dev, libmysqlclient-dev, diff --git a/doc/user/tutorial.xml b/doc/user/tutorial.xml index 6e4f36a1d14fbc64b2b33f19e85a49e7593adaf1..755c089b96c81756d3bf0c1b29a04c2927659445 100644 --- a/doc/user/tutorial.xml +++ b/doc/user/tutorial.xml @@ -316,7 +316,7 @@ and a reasonable choice is <computeroutput><option>-DENABLE_CLIENT=true</option> This step is optional.</para> <para>Say:<programlisting><command>python --version</command></programlisting> ... You should see that the python version is between 2.6 and 3.</para> -<para>On Ubuntu you can get modules from the repository:<programlisting><command>sudo apt-get install</command> python-daemon python-yaml python-argparse python-pexpect</programlisting></para> +<para>On Ubuntu you can get modules from the repository:<programlisting><command>sudo apt-get install</command> python-daemon python-yaml python-argparse</programlisting></para> <para>On CentOS too you can get modules from the repository:<programlisting><command>sudo yum install</command> python26 python26-PyYAML python26-argparse</programlisting></para> <para>But in general it is best to set up the modules by getting a tarball and doing the setup with <computeroutput>python setup.py</computeroutput>, thus: @@ -327,13 +327,6 @@ and a reasonable choice is <computeroutput><option>-DENABLE_CLIENT=true</option> <command>tar</command> <option>-xzf</option> PyYAML-3.10.tar.gz <command>cd</command> PyYAML-3.10 <command>sudo python</command> setup.py install -# python module for spawning child applications (pexpect): -# (If wget fails, check the <citetitle xlink:href="http://pypi.python.org/pypi/pexpect/" xlink:title="pure-Python pexpect implementation">python-pexpect</citetitle> web site to see what the current version is.) -<command>cd</command> ~ -<command>wget</command> http://pypi.python.org/packages/source/p/pexpect-u/pexpect-u-2.5.1.tar.gz -<command>tar</command> <option>-xzvf</option> pexpect-u-2.5.1.tar. -<command>cd</command> pexpect-u-2.5.1 -<command>sudo python</command> setup.py install # python module for assisting programs to turn themselves into daemons (daemon): # (if wget fails, check the <citetitle xlink:href="http://pypi.python.org/pypi/python-daemon" xlink:title="Python daemon">python-daemon</citetitle> web site to see what the current version is.) <command>cd</command> ~ diff --git a/test/lib/tarantool_server.py b/test/lib/tarantool_server.py index 1a29c5dd52ce0e65b577a8c172892793949f138b..87f3e3656ca67382a7167754cd2ccbb9fa85fcf5 100644 --- a/test/lib/tarantool_server.py +++ b/test/lib/tarantool_server.py @@ -10,7 +10,6 @@ import socket import signal import shlex import shutil -import pexpect import traceback import subprocess import ConfigParser