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

Don't test Radicale under Python 2

Browse source
This commit is contained in:
Markus Unterwaditzer 2016-04-01 23:47:36 +02:00
parent b501a86081
commit 4cb7e6c1f5
2 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.travis.yml
View file

@ -30,18 +30,6 @@
"env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=minimal BUILD_PRS=false", "env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=minimal BUILD_PRS=false",
"python": "2.7" "python": "2.7"
}, },
{
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=true",
"python": "2.7"
},
{
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=true",
"python": "2.7"
},
{
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=true",
"python": "2.7"
},
{ {
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=devel BUILD_PRS=false", "env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=devel BUILD_PRS=false",
"python": "2.7" "python": "2.7"
@ -178,18 +166,6 @@
"env": "BUILD=style BUILD_PRS=true", "env": "BUILD=style BUILD_PRS=true",
"python": "pypy" "python": "pypy"
}, },
{
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=false",
"python": "pypy"
},
{
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=false",
"python": "pypy"
},
{
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=false",
"python": "pypy"
},
{ {
"env": "BUILD=test", "env": "BUILD=test",
"language": "generic", "language": "generic",

10
scripts/make_travisconf.py
View file

@ -44,9 +44,15 @@ for python in ("2.7", "3.3", "3.4", "3.5", "pypy"):
'env': 'BUILD=style BUILD_PRS=true' 'env': 'BUILD=style BUILD_PRS=true'
}) })
if python in ("2.7", "3.5"): if python == "3.5":
dav_servers = ("radicale", "owncloud", "baikal", "davical") dav_servers = ("radicale", "owncloud", "baikal", "davical")
rs_servers = ("mysteryshack",) rs_servers = ("mysteryshack",)
elif python == "2.7":
dav_servers = ("owncloud", "baikal", "davical")
rs_servers = ("mysteryshack",)
elif python == "pypy":
dav_servers = ()
rs_servers = ()
else: else:
dav_servers = ("radicale",) dav_servers = ("radicale",)
rs_servers = () rs_servers = ()
@ -59,7 +65,7 @@ for python in ("2.7", "3.3", "3.4", "3.5", "pypy"):
("devel", "release", "minimal") ("devel", "release", "minimal")
): ):
build_prs = ( build_prs = (
python in ("2.7", "3.5") and python == "3.5" and
server_type == 'DAV' and server_type == 'DAV' and
server == 'radicale' server == 'radicale'
) )