Add Jython support

master
baztian 2020-06-17 22:47:47 +02:00
parent 509db87ec8
commit ab925619d6
4 changed files with 22 additions and 9 deletions

View File

@ -16,6 +16,12 @@ jobs:
strategy: strategy:
matrix: matrix:
python-version: [2.7, 3.5, 3.6] python-version: [2.7, 3.5, 3.6]
plattform: ["Python"]
include:
- python-version: 3.6
plattform: "Jython"
jython: org.python:jython-installer:2.7.2
toxenv: "jython-driver-{hsqldb,mock}"
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -23,7 +29,18 @@ jobs:
uses: actions/setup-python@v2 uses: actions/setup-python@v2
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
- name: Consider Jython
run: |
ci/before_install_jython.sh
if: matrix.jython
env:
JYTHON: ${{ matrix.jython }}
- name: Install dependencies - name: Install dependencies
run: pip install coveralls tox tox-gh-actions # for some reason installing from https://github.com/baztian/tox-gh-actions/archive/allow-env-override.tar.gz doesn't work
- name: Test with tox run: pip install coveralls tox git+https://github.com/baztian/tox-gh-actions.git@allow-env-override
- name: Test with tox for Jython only
if: matrix.jython
run: tox -e "${{ matrix.toxenv }}"
- name: Test with tox for non Jython only
if: ${{ ! matrix.jython }}
run: tox run: tox

View File

@ -1,4 +0,0 @@
#!/bin/sh
set -e
[ -n "$JYTHON" ] && "${TRAVIS_BUILD_DIR}/ci/before_install_jython.sh" || true

View File

@ -3,9 +3,8 @@ set -e
INST_DIR=$HOME/jython/jython-${JYTHON##*:} INST_DIR=$HOME/jython/jython-${JYTHON##*:}
if [ ! -d "$INST_DIR" ]; then if [ ! -d "$INST_DIR" ]; then
JYTHON_JAR=$(${TRAVIS_BUILD_DIR}/ci/mvnget.sh "$JYTHON") JYTHON_JAR=$(${PWD}/ci/mvnget.sh "$JYTHON")
java -jar ${JYTHON_JAR} -s -d "$INST_DIR" java -jar ${JYTHON_JAR} -s -d "$INST_DIR"
fi fi
pip install --upgrade virtualenv==15.1.0 tox==3.9.0 coverage==4.5.4 pip install --upgrade virtualenv==15.1.0 tox==3.9.0 coverage==4.5.4
mkdir -p $HOME/bin sudo ln -s "$INST_DIR"/bin/jython /usr/local/bin/
ln -s "$INST_DIR"/bin/jython $HOME/bin/

View File

@ -9,6 +9,7 @@ python =
2.7: py27-driver-{hsqldb,mock,sqliteXerial,sqlitePy}-newjpype, py27-driver-{hsqldb,mock}-oldjpype 2.7: py27-driver-{hsqldb,mock,sqliteXerial,sqlitePy}-newjpype, py27-driver-{hsqldb,mock}-oldjpype
3.5: py35-driver-{hsqldb,mock,sqliteXerial}-newjpype 3.5: py35-driver-{hsqldb,mock,sqliteXerial}-newjpype
3.6: py36-driver-{hsqldb,mock,sqliteXerial}-newjpype, py36-driver-{hsqldb,mock}-oldjpype 3.6: py36-driver-{hsqldb,mock,sqliteXerial}-newjpype, py36-driver-{hsqldb,mock}-oldjpype
3.8: py38-driver-{hsqldb,mock,sqliteXerial}-newjpype, py38-driver-{hsqldb,mock}-oldjpype
[testenv] [testenv]
# usedevelop required to enable coveralls source code view. # usedevelop required to enable coveralls source code view.