From f294a78664629cd5bc6fad36d5d913678e9ec86f Mon Sep 17 00:00:00 2001 From: baztian Date: Sun, 26 Apr 2015 20:14:38 +0200 Subject: [PATCH] Removed official Jython 2.5.3 support in favour of less complex Travis CI build. Fix other travis ci issues. --- .travis.yml | 4 ---- README.rst | 4 ++-- ci/before_install_jython.sh | 23 +---------------------- requirements-jython.txt | 1 - test/test_integration.py | 5 ++++- test/test_mock.py | 5 ++++- test/testsuite.py | 5 ++++- 7 files changed, 15 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index 89334d7..2f6550f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,12 +28,8 @@ matrix: include: - python: 2.7 env: TESTNAME=test_integration.SqlitePyTest - - python: 2.7 - env: JYTHON=org.python:jython-installer:2.5.3 TESTNAME=test_integration.HsqldbTest JDBC_DRIVER=org.hsqldb:hsqldb:1.8.0.10 - python: 2.7 env: JYTHON=org.python:jython-installer:2.7-rc1 TESTNAME=test_integration.HsqldbTest JDBC_DRIVER=org.hsqldb:hsqldb:1.8.0.10 - - python: 2.7 - env: JYTHON=org.python:jython-installer:2.5.3 TESTNAME=test_mock JDBC_DRIVER=org.jaydebeapi:mockdriver:1.0-SNAPSHOT - python: 2.7 env: JYTHON=org.python:jython-installer:2.7-rc1 TESTNAME=test_mock JDBC_DRIVER=org.jaydebeapi:mockdriver:1.0-SNAPSHOT diff --git a/README.rst b/README.rst index 02dbe30..c73e41d 100644 --- a/README.rst +++ b/README.rst @@ -11,7 +11,7 @@ .. image:: https://img.shields.io/badge/python-2.6,_2.7,_3.4-blue.svg :target: https://pypi.python.org/pypi/JayDeBeApi -.. image:: https://img.shields.io/badge/jython-2.5.3,_2.7--rc1-blue.svg +.. image:: https://img.shields.io/badge/jython-2.7--rc1-blue.svg :target: https://pypi.python.org/pypi/JayDeBeApi .. image:: https://pypip.in/version/JayDeBeApi/badge.svg @@ -58,7 +58,7 @@ or if you are using Jython use :: $ jython setup.py install -It has been tested with Jython 2.5.3 an 2.7-b3. +It has been tested with Jython 2.7-rc1. If you are using cPython ensure that you have installed JPype_ properly. It has been tested with JPype1 0.5.7. Older JPype diff --git a/ci/before_install_jython.sh b/ci/before_install_jython.sh index 7dbbf45..d1b5ff8 100755 --- a/ci/before_install_jython.sh +++ b/ci/before_install_jython.sh @@ -4,29 +4,8 @@ set -e JYTHON_JAR=$(${TRAVIS_BUILD_DIR}/ci/mvnget.sh $JYTHON) java -jar ${JYTHON_JAR} -s -d $HOME/jython -BEFORE_PY_26=$($HOME/jython/bin/jython -c "import sys; print sys.version_info < (2, 6)") -if [ "$BEFORE_PY_26" == "True" ] -then - curl http://peak.telecommunity.com/dist/ez_setup.py -o ez_setup.py - $HOME/jython/bin/jython ez_setup.py - # Install the latest pip compatible with Jython 2.5.3 - $HOME/jython/bin/easy_install pip==1.2.1 -else - $HOME/jython/bin/jython -m ensurepip -fi +$HOME/jython/bin/jython -m ensurepip # Install the latest virtualenv compatible with Jython $HOME/jython/bin/pip install virtualenv==1.9.1 $HOME/jython/bin/virtualenv $HOME/myvirtualenv - -if [ "$BEFORE_PY_26" == "True" ] -then - # No SSL support for Jython - cat > $HOME/myvirtualenv/pip.conf <> $HOME/myvirtualenv/bin/activate -export PIP_CONFIG_FILE=$HOME/myvirtualenv/pip.conf -EOF -fi diff --git a/requirements-jython.txt b/requirements-jython.txt index da45555..9696b3b 100644 --- a/requirements-jython.txt +++ b/requirements-jython.txt @@ -1,2 +1 @@ -JPype1==0.6.0 unittest2==0.5.1 diff --git a/test/test_integration.py b/test/test_integration.py index ae07e4c..42b6117 100644 --- a/test/test_integration.py +++ b/test/test_integration.py @@ -23,7 +23,10 @@ import os import sys import threading -import unittest2 as unittest +try: + import unittest2 as unittest +except ImportError: + import unittest _THIS_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/test/test_mock.py b/test/test_mock.py index 0f2d796..6dcb702 100644 --- a/test/test_mock.py +++ b/test/test_mock.py @@ -19,7 +19,10 @@ import jaydebeapi -import unittest2 as unittest +try: + import unittest2 as unittest +except ImportError: + import unittest class MockTest(unittest.TestCase): diff --git a/test/testsuite.py b/test/testsuite.py index c77aeae..56f6556 100644 --- a/test/testsuite.py +++ b/test/testsuite.py @@ -4,7 +4,10 @@ from optparse import OptionParser import sys -import unittest2 as unittest +try: + import unittest2 as unittest +except ImportError: + import unittest def main(): parser = OptionParser()