Skip to content

Commit

Permalink
py26 test config replaced with py36 #84
Browse files Browse the repository at this point in the history
  • Loading branch information
Luiko Czub committed Mar 23, 2017
1 parent b941002 commit 3548a32
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 24 deletions.
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
sudo: false
language: python
python:
- "2.6"
- "2.7"
- "3.3"
- "3.4"
- "3.5"
- "3.6"

# command to install dependencies
install:
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install argparse; fi
- pip install .

# command to run tests
Expand Down
17 changes: 3 additions & 14 deletions doc/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,8 @@ TestLink-API-Python-client Installation
Preconditions
-------------

Currently the combinations Python 2.6.9/2.7.12/3.3.5/3.4.4/3.5.2 are tested with
TestLink 1.9.15 including the fixes

- `TL 7696 <http://mantis.testlink.org/view.php?id=7696>`_ ,
`TL 7708 <http://mantis.testlink.org/view.php?id=7708>`_ and
`TL 7765 <http://mantis.testlink.org/view.php?id=7765>`_

Other combination might work - feedback is welcome :-)

To use TestLink-API-Python-client under Py26, the module **argparse** must be
installed additionally (Py27, Py33, Py34 and Py35 already includes this)::

pip install argparse
Currently the combinations Python 2.7.13/3.4.4/3.5.3/3.6.1 are tested with
TestLink 1.9.16. Other combination might work - feedback is welcome :-)

TestLink configuration
----------------------
Expand Down Expand Up @@ -116,7 +105,7 @@ with connection parameter as environment variables
- TESTLINK_API_PYTHON_SERVER_URL and TESTLINK_API_PYTHON_DEVKEY

Known Installation Problems
----------------------------
---------------------------

If the installation for the combination **linux + py26** fails, maybe the workaround from `issue 50`_ helps.

Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@
'Development Status :: 5 - Production/Stable',
'License :: OSI Approved :: Apache Software License',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Topic :: Software Development :: Testing',
'Topic :: Software Development :: Libraries :: Python Modules'
]
Expand Down
2 changes: 1 addition & 1 deletion src/testlink/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
#
# ------------------------------------------------------------------------

VERSION = '0.6.4-dev080'
VERSION = '0.6.4-dev084'
TL_RELEASE = '1.9.16'

4 changes: 1 addition & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@
# TESTLINK_API_PYTHON_DEVKEY and TESTLINK_API_PYTHON_SERVER_URL
# with your server settings
[tox]
envlist = py26,py27,py33,py34,py35
envlist = py27,py34,py35,py36
[testenv]
deps=pytest
py26: unittest2
py26: argparse
setenv=
TESTLINK_API_PYTHON_DEVKEY={env:TESTLINK_API_PYTHON_DEVKEY:3ec96581bb3d8a34cd28ce338b641063}
TESTLINK_API_PYTHON_SERVER_URL={env:TESTLINK_API_PYTHON_SERVER_URL:http://demo.testlink.org/latest/lib/api/xmlrpc/v1/xmlrpc.php}
Expand Down

0 comments on commit 3548a32

Please sign in to comment.