diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 215a4b4..a914ff3 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -16,6 +16,12 @@ jobs: strategy: matrix: 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: - uses: actions/checkout@v2 @@ -23,7 +29,18 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} + - name: Consider Jython + run: | + ci/before_install_jython.sh + if: matrix.jython + env: + JYTHON: ${{ matrix.jython }} - name: Install dependencies - run: pip install coveralls tox tox-gh-actions - - name: Test with tox + # for some reason installing from https://github.com/baztian/tox-gh-actions/archive/allow-env-override.tar.gz doesn't work + 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 diff --git a/ci/before_install.sh b/ci/before_install.sh deleted file mode 100755 index 1a99394..0000000 --- a/ci/before_install.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -set -e - -[ -n "$JYTHON" ] && "${TRAVIS_BUILD_DIR}/ci/before_install_jython.sh" || true diff --git a/ci/before_install_jython.sh b/ci/before_install_jython.sh index 5aa7f17..ae5a59f 100755 --- a/ci/before_install_jython.sh +++ b/ci/before_install_jython.sh @@ -3,9 +3,8 @@ set -e INST_DIR=$HOME/jython/jython-${JYTHON##*:} 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" fi pip install --upgrade virtualenv==15.1.0 tox==3.9.0 coverage==4.5.4 -mkdir -p $HOME/bin -ln -s "$INST_DIR"/bin/jython $HOME/bin/ +sudo ln -s "$INST_DIR"/bin/jython /usr/local/bin/ diff --git a/tox.ini b/tox.ini index dd68490..48b5216 100644 --- a/tox.ini +++ b/tox.ini @@ -9,6 +9,7 @@ python = 2.7: py27-driver-{hsqldb,mock,sqliteXerial,sqlitePy}-newjpype, py27-driver-{hsqldb,mock}-oldjpype 3.5: py35-driver-{hsqldb,mock,sqliteXerial}-newjpype 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] # usedevelop required to enable coveralls source code view.