sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove pypy3 from build matrix (#649)

Browse source
This commit is contained in:
Markus Unterwaditzer 2017-07-07 20:00:14 +02:00 committed by GitHub
parent 37a1eb2fdb
commit 3affea685a
3 changed files with 2 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.travis.yml
View file

@ -136,18 +136,6 @@
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal BUILD_PRS=true ",
"python": "3.6" "python": "3.6"
}, },
{
"env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=devel BUILD_PRS=true ",
"python": "pypy3"
},
{
"env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=release BUILD_PRS=true ",
"python": "pypy3"
},
{
"env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=minimal BUILD_PRS=true ",
"python": "pypy3"
},
{ {
"env": "BUILD=test ETESYNC_TESTS=true REQUIREMENTS=latest BUILD_PRS=true ", "env": "BUILD=test ETESYNC_TESTS=true REQUIREMENTS=latest BUILD_PRS=true ",
"python": "3.6" "python": "3.6"

5
scripts/make_travisconf.py
View file

@ -2,7 +2,7 @@ import itertools
import json import json
import sys import sys
python_versions = ("3.3", "3.4", "3.5", "3.6", "pypy3") python_versions = ("3.3", "3.4", "3.5", "3.6")
latest_python = "3.6" latest_python = "3.6"
cfg = {} cfg = {}
@ -46,9 +46,6 @@ matrix.append({
for python, requirements in itertools.product(python_versions, for python, requirements in itertools.product(python_versions,
("devel", "release", "minimal")): ("devel", "release", "minimal")):
if python == "pypy3":
dav_servers = ("skip",)
else:
dav_servers = ("radicale", "xandikos") dav_servers = ("radicale", "xandikos")
if python == latest_python and requirements == "release": if python == latest_python and requirements == "release":

18
scripts/travis-install.sh
View file

@ -1,23 +1,5 @@
#!/bin/sh #!/bin/sh
# Travis uses an outdated PyPy, this installs the most recent one. This
# makes the tests run on Travis' legacy infrastructure, but so be it.
# temporary pyenv installation to get pypy-2.6 before container infra
# upgrade
# Taken from werkzeug, which took it from pyca/cryptography
if [ "$TRAVIS_PYTHON_VERSION" = "pypy3" ]; then
PYENV_ROOT="$HOME/.pyenv";
rm -rf "$PYENV_ROOT";
git clone https://github.com/yyuu/pyenv.git "$PYENV_ROOT";
PATH="$PYENV_ROOT/bin:$PATH";
eval "$(pyenv init -)";
pypyversion="pypy3.5-5.7-beta";
pyenv install $pypyversion;
pyenv global $pypyversion;
python --version;
pip --version;
fi
# The OS X VM doesn't have any Python support at all # The OS X VM doesn't have any Python support at all
# See https://github.com/travis-ci/travis-ci/issues/2312 # See https://github.com/travis-ci/travis-ci/issues/2312
if [ "$TRAVIS_OS_NAME" = "osx" ]; then if [ "$TRAVIS_OS_NAME" = "osx" ]; then