From 2a49ef709ba18ed86147ade1d4c2a50b6cbe8368 Mon Sep 17 00:00:00 2001 From: Sam Van Oort Date: Sat, 5 Mar 2016 14:27:15 -0500 Subject: [PATCH] Changelog & docs update, plus a test fix to Py3 TestPyPi --- CHANGELOG.md | 2 +- README.md | 6 +++--- jenkins/lib-jenkins-installtests.groovy | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a5553d4..c2b6b17f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 1.7.0 Unreleased but on master branch (tentative Pip release in December/Jan) +## 1.7.0 Sat Mar 06 14:30:00 2016 -0400 **Features:** * Unicode support epic: fix handling of request body and a whole raft of smaller fixes + more tests: https://github.com/svanoort/pyresttest/issues/104 * ALPHA: Python 3 support - all tests now pass! diff --git a/README.md b/README.md index 750bd8a2..bc649dac 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), making it easy to deploy on-server for smoketests/healthchecks +- Minimal dependencies (pycurl, pyyaml, 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,13 +49,13 @@ 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+ (alpha status, not released for pip install yet). +PyRestTest works on Linux or Mac with Python 2.6, 2.7, or 3.3+. **First we need to install package python-pycurl:** * Ubuntu/Debian: (sudo) `apt-get install python-pycurl` * CentOS/RHEL: (sudo) `yum install python-pycurl` * Mac: *don't worry about it* -* Other platforms: *unsupported.* You *may* get it to work by installing pycurl & pyyaml manually. No guarantees though. +* Other platforms: *unsupported.* You *may* get it to work by installing pycurl & pyyaml manually. Also include 'future' for Python 3. No guarantees though. *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:** diff --git a/jenkins/lib-jenkins-installtests.groovy b/jenkins/lib-jenkins-installtests.groovy index af3788db..77507ea0 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 'Basic Test: running from setup.py install' + stage 'Test Instant: setup.py install' execute_install_testset([testPy27_directInstall, testPy26_directInstall, testPy34_directInstall], test_direct_names) } } @@ -217,7 +217,7 @@ void do_pip_develop_tests(String pyresttestBranch='master') { } dir('pyresttest') { git url:'https://github.com/svanoort/pyresttest.git', branch:pyresttestBranch - stage 'Basic Test: pip develop mode install' + stage 'Test Install: using pip develop mode' execute_install_testset([testPy27_pip_develop, testPy26_pip_develop, testPy34_pip_develop], test_pip_develop_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, 'pip install pyyaml', pyr_install_pypi, testBasic1, testBasic2, testApiDirect, testApiUtil]] + def testPy34_pypi = [basePy34, [installAptPybasePy3, 'sudo pip install pyyaml', pyr_install_pypi, testBasic1, testBasic2, testApiDirect, testApiUtil]] docker.image('sudo-python3:3.4.3-wheezy').inside() { sh 'sudo rm -rf pyresttest-pypi' @@ -255,7 +255,7 @@ void do_pypi_tests(String pyresttestBranch='master', String pypiServer='https:// dir('pyresttest-pypi') { git url:'https://github.com/svanoort/pyresttest.git', branch:pyresttestBranch sh 'rm -rf pyresttest' - stage 'Basic Test: pip develop mode install' + stage 'Test Pip Install From TestPyPi' execute_install_testset([testPy27_pypi, testPy26_pypi, testPy34_pypi], test_pypi_names) } }