diff --git a/README.md b/README.md index bc649dac..06f4d6e6 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ pyresttest # What Is It? - A REST testing and API microbenchmarking tool - Tests are defined in basic YAML or JSON config files, no code needed -- Minimal dependencies (pycurl, pyyaml, future), making it easy to deploy on-server for smoketests/healthchecks +- Minimal dependencies (pycurl, pyyaml, optionally future), making it easy to deploy on-server for smoketests/healthchecks - Supports [generate/extract/validate](advanced_guide.md) mechanisms to create full test scenarios - Returns exit codes on failure, to slot into automated configuration management/orchestration tools (also supplies parseable logs) - Logic is written and [extensible](extensions.md) in Python @@ -49,7 +49,7 @@ Apache License, Version 2.0 * The changelog will also show features/fixes currently merged to the master branch but not released to PyPi yet (pending installation tests across platforms). # Installation -PyRestTest works on Linux or Mac with Python 2.6, 2.7, or 3.3+. +PyRestTest works on Linux or Mac with Python 2.6, 2.7, or 3.3+ (with module 'future' installed) **First we need to install package python-pycurl:** * Ubuntu/Debian: (sudo) `apt-get install python-pycurl` @@ -59,7 +59,7 @@ PyRestTest works on Linux or Mac with Python 2.6, 2.7, or 3.3+. *This is needed because the pycurl dependency may fail to install by pip. In *very rare* cases you may need to intall python-pyyaml if pip cannot install it correctly.* **It is easy to install the latest release by pip:** -(sudo) `pip install pyresttest` +(sudo) `pip install pyresttest` (also install 'future' if on Python 3) **If pip isn't installed, we'll want to install it first:** If that is not installed, we'll need to install it first: diff --git a/jenkins/lib-jenkins-installtests.groovy b/jenkins/lib-jenkins-installtests.groovy index 77507ea0..6c1efc90 100644 --- a/jenkins/lib-jenkins-installtests.groovy +++ b/jenkins/lib-jenkins-installtests.groovy @@ -175,7 +175,7 @@ void do_directinstall_test(String pyresttestBranch='master') { } dir('pyresttest') { git url:'https://github.com/svanoort/pyresttest.git', branch:pyresttestBranch - stage 'Test Instant: setup.py install' + stage 'Test Install: setup.py install' execute_install_testset([testPy27_directInstall, testPy26_directInstall, testPy34_directInstall], test_direct_names) } } @@ -247,7 +247,7 @@ void do_pypi_tests(String pyresttestBranch='master', String pypiServer='https:// def testPy26_pypi = [basePy26, [installYumPybase, pyr_install_pypi, testBasic1, testBasic2, testApiDirect, testApiUtil]] def testPy27_pypi = [basePy27, [installAptPybase, pyr_install_pypi, testBasic1, testBasic2, testApiDirect, testApiUtil]] - def testPy34_pypi = [basePy34, [installAptPybasePy3, 'sudo pip install pyyaml', pyr_install_pypi, testBasic1, testBasic2, testApiDirect, testApiUtil]] + def testPy34_pypi = [basePy34, [installAptPybasePy3, 'sudo pip install pyyaml future', pyr_install_pypi, testBasic1, testBasic2, testApiDirect, testApiUtil]] docker.image('sudo-python3:3.4.3-wheezy').inside() { sh 'sudo rm -rf pyresttest-pypi' diff --git a/setup.py b/setup.py index 7ddf6bba..aec511fe 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from distutils.core import setup # Future is needed for pip distribution for python 3 support -dependencies = ['pyyaml', 'pycurl', 'future'] +dependencies = ['pyyaml', 'pycurl'] test_dependencies = ['django==1.6.5','django-tastypie==0.12.1','jsonpath','jmespath'] # Add additional compatibility shims