Skip to content

Commit a269e31

Browse files
committed
Future breaks python 26, so add mention of requirement for python 3
1 parent 2a49ef7 commit a269e31

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pyresttest
3131
# What Is It?
3232
- A REST testing and API microbenchmarking tool
3333
- Tests are defined in basic YAML or JSON config files, no code needed
34-
- Minimal dependencies (pycurl, pyyaml, future), making it easy to deploy on-server for smoketests/healthchecks
34+
- Minimal dependencies (pycurl, pyyaml, optionally future), making it easy to deploy on-server for smoketests/healthchecks
3535
- Supports [generate/extract/validate](advanced_guide.md) mechanisms to create full test scenarios
3636
- Returns exit codes on failure, to slot into automated configuration management/orchestration tools (also supplies parseable logs)
3737
- Logic is written and [extensible](extensions.md) in Python
@@ -49,7 +49,7 @@ Apache License, Version 2.0
4949
* The changelog will also show features/fixes currently merged to the master branch but not released to PyPi yet (pending installation tests across platforms).
5050

5151
# Installation
52-
PyRestTest works on Linux or Mac with Python 2.6, 2.7, or 3.3+.
52+
PyRestTest works on Linux or Mac with Python 2.6, 2.7, or 3.3+ (with module 'future' installed)
5353

5454
**First we need to install package python-pycurl:**
5555
* 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+.
5959
*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.*
6060

6161
**It is easy to install the latest release by pip:**
62-
(sudo) `pip install pyresttest`
62+
(sudo) `pip install pyresttest` (also install 'future' if on Python 3)
6363

6464
**If pip isn't installed, we'll want to install it first:**
6565
If that is not installed, we'll need to install it first:

jenkins/lib-jenkins-installtests.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ void do_directinstall_test(String pyresttestBranch='master') {
175175
}
176176
dir('pyresttest') {
177177
git url:'https://github.com/svanoort/pyresttest.git', branch:pyresttestBranch
178-
stage 'Test Instant: setup.py install'
178+
stage 'Test Install: setup.py install'
179179
execute_install_testset([testPy27_directInstall, testPy26_directInstall, testPy34_directInstall], test_direct_names)
180180
}
181181
}
@@ -247,7 +247,7 @@ void do_pypi_tests(String pyresttestBranch='master', String pypiServer='https://
247247

248248
def testPy26_pypi = [basePy26, [installYumPybase, pyr_install_pypi, testBasic1, testBasic2, testApiDirect, testApiUtil]]
249249
def testPy27_pypi = [basePy27, [installAptPybase, pyr_install_pypi, testBasic1, testBasic2, testApiDirect, testApiUtil]]
250-
def testPy34_pypi = [basePy34, [installAptPybasePy3, 'sudo pip install pyyaml', pyr_install_pypi, testBasic1, testBasic2, testApiDirect, testApiUtil]]
250+
def testPy34_pypi = [basePy34, [installAptPybasePy3, 'sudo pip install pyyaml future', pyr_install_pypi, testBasic1, testBasic2, testApiDirect, testApiUtil]]
251251

252252
docker.image('sudo-python3:3.4.3-wheezy').inside() {
253253
sh 'sudo rm -rf pyresttest-pypi'

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from distutils.core import setup
66

77
# Future is needed for pip distribution for python 3 support
8-
dependencies = ['pyyaml', 'pycurl', 'future']
8+
dependencies = ['pyyaml', 'pycurl']
99
test_dependencies = ['django==1.6.5','django-tastypie==0.12.1','jsonpath','jmespath']
1010

1111
# Add additional compatibility shims

0 commit comments

Comments
 (0)