From b3e389cb59538b9e4c795afa422a3918956276f5 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Thu, 23 Feb 2017 16:44:16 +0100
Subject: [PATCH] Enable PyPy3 (#562)

* Enable PyPy3
---
 .travis.yml                | 24 ++++++++++++++++++++++++
 scripts/make_travisconf.py |  2 +-
 scripts/travis-install.sh  |  6 +++---
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 652fa48..30d187e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -165,6 +165,30 @@
         "env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=minimal ",
         "python": "3.6"
       },
+      {
+        "env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=devel ",
+        "python": "pypy3"
+      },
+      {
+        "env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=release ",
+        "python": "pypy3"
+      },
+      {
+        "env": "BUILD=test DAV_SERVER=skip REQUIREMENTS=minimal ",
+        "python": "pypy3"
+      },
+      {
+        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel ",
+        "python": "pypy3"
+      },
+      {
+        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release ",
+        "python": "pypy3"
+      },
+      {
+        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal ",
+        "python": "pypy3"
+      },
       {
         "env": "BUILD=test",
         "language": "generic",
diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py
index 26512be..69fd3ad 100644
--- a/scripts/make_travisconf.py
+++ b/scripts/make_travisconf.py
@@ -2,7 +2,7 @@ import itertools
 import json
 import sys
 
-python_versions = ("3.3", "3.4", "3.5", "3.6")
+python_versions = ("3.3", "3.4", "3.5", "3.6", "pypy3")
 latest_python = "3.6"
 
 cfg = {}
diff --git a/scripts/travis-install.sh b/scripts/travis-install.sh
index 2dc277e..abd47c3 100644
--- a/scripts/travis-install.sh
+++ b/scripts/travis-install.sh
@@ -5,13 +5,13 @@
 # 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" = "pypy" ]; then
+if [ "$TRAVIS_PYTHON_VERSION" = "pypy3" ]; then
     git clone https://github.com/yyuu/pyenv.git ~/.pyenv;
     PYENV_ROOT="$HOME/.pyenv";
     PATH="$PYENV_ROOT/bin:$PATH";
     eval "$(pyenv init -)";
-    pyenv install pypy-4.0.1;
-    pyenv global pypy-4.0.1;
+    pyenv install pypy3.3-5.5-alpha;
+    pyenv global pypy3.3-5.5-alpha;
     python --version;
     pip --version;
 fi