Briq
/
jaydebeapi
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Try to fix some travis issues

master
baztian 2020-05-25 17:36:22 +02:00
parent 2d636a2927
commit 875c857d47
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.travis.yml
View File

@ -1,11 +1,10 @@
os: linux
dist: focal
language: python language: python
# use container-based infrastructure
sudo: false
deploy: deploy:
provider: pypi provider: pypi
user: cheffe username: cheffe
password: password:
secure: ZQsqnd4Ux3erP0xfLJefJ/90wcJX/L2SfYOZFPbAIwJaX3n9iXf7jOGaT5FzJxLH+c0RJ1varqX0WZo1v0YKRz05IiSCLfZIT3Ia/Cy4nOLLL4a6CFUqzTlO7V1xyKMtQKimWGF5AYTAWvLTPu7cdDeg1YPENrZBYZPvJ/yRiJ4= secure: ZQsqnd4Ux3erP0xfLJefJ/90wcJX/L2SfYOZFPbAIwJaX3n9iXf7jOGaT5FzJxLH+c0RJ1varqX0WZo1v0YKRz05IiSCLfZIT3Ia/Cy4nOLLL4a6CFUqzTlO7V1xyKMtQKimWGF5AYTAWvLTPu7cdDeg1YPENrZBYZPvJ/yRiJ4=
distributions: "sdist bdist_wheel" distributions: "sdist bdist_wheel"
@ -21,14 +20,14 @@ cache:
python: python:
- '2.7' - '2.7'
- '3.4' - '3.5'
- '3.6' - '3.6'
env: env:
matrix: jobs:
include: include:
- python: 3.6 - python: 3.6
env: JYTHON=org.python:jython-installer:2.7.0 TOXENV="jython-driver-{hsqldb,mock}" env: JYTHON=org.python:jython-installer:2.7.2 TOXENV="jython-driver-{hsqldb,mock}"
before_install: before_install:
- ci/before_install.sh - ci/before_install.sh

9
README_development.rst
View File

@ -19,15 +19,10 @@ Setup test requirements
pip install -rdev-requirements.txt pip install -rdev-requirements.txt
# Install Jython 2.7 # Install Jython 2.7
ci/mvnget.sh org.python:jython-installer:2.7.0 ci/mvnget.sh org.python:jython-installer:2.7.2
java -jar jython-installer-2.7.0.jar && rm jython-installer-2.7.0.jar java -jar jython-installer-2.7.2.jar && rm jython-installer-2.7.2.jar
# add jython to your path # add jython to your path
# Install Python 2.6
sudo add-apt-repository ppa:deadsnakes/ppa
sudo apt-get update
sudo apt-get install python2.6 python2.6-dev
# run tests for all supported envs # run tests for all supported envs
tox tox

1
ci/before_install_jython.sh
View File

@ -5,6 +5,7 @@ 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=$(${TRAVIS_BUILD_DIR}/ci/mvnget.sh "$JYTHON")
java -jar ${JYTHON_JAR} -s -d "$INST_DIR" java -jar ${JYTHON_JAR} -s -d "$INST_DIR"
$HOME/jython/bin/pip install --upgrade pip
fi fi
mkdir -p $HOME/bin mkdir -p $HOME/bin
ln -s "$INST_DIR"/bin/jython $HOME/bin/ ln -s "$INST_DIR"/bin/jython $HOME/bin/

4
tox.ini
View File

@ -4,7 +4,7 @@ envlist = py{27,3}-driver-{hsqldb,mock,sqliteXerial}-newjpype,py{27,3}-driver-{h
[travis] [travis]
python = 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.4: py34-driver-{hsqldb,mock,sqliteXerial}-newjpype 3.5: py34-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
[testenv] [testenv]
@ -19,7 +19,7 @@ setenv =
driver-sqlitePy: TESTNAME=test_integration.SqlitePyTest driver-sqlitePy: TESTNAME=test_integration.SqlitePyTest
deps = deps =
oldjpype: JPype1==0.6.3 oldjpype: JPype1==0.6.3
newjpype: JPype1==0.7.4 newjpype: JPype1==0.7.1
# https://github.com/jiptool/jip/issues/54 # https://github.com/jiptool/jip/issues/54
#jip==0.9.14 #jip==0.9.14
https://github.com/jiptool/jip/archive/0.9.14.tar.gz https://github.com/jiptool/jip/archive/0.9.14.tar.gz