Merge pull request #2792 from xonsh/pypytravis

Pypytravis

.travis.yml

@@ -19,6 +19,10 @@ matrix:
             - BUILD_DOCS=true
         - os: linux
           python: "nightly"
+        - os: linux
+          python: "pypy3"
+          env:
+            - BUILD_DOCS=false
         - os: osx
           language: generic
           env: PYTHON="3.6" MINICONDA_OS="MacOSX"
@@ -26,7 +30,7 @@ matrix:
           language: generic
           env: PYTHON="3.7" MINICONDA_OS="MacOSX"
     allow_failures:
-        - python: "nightly"
+        - python: ["nightly", "pypy3"]
 
 before_install:
   - if [[ ! ("$TRAVIS_PYTHON_VERSION" == "nightly" || "$TRAVIS_PYTHON_VERSION" == "3.6-dev") && ! $BUILD_DOCS ]]; then

xonsh-in-docker.py

@@ -10,7 +10,8 @@ parser = argparse.ArgumentParser(description=program_description)
 
 parser.add_argument('env', nargs='*', default=[], metavar='ENV=value')
 parser.add_argument('--python', '-p', default='3.4', metavar='python_version')
-parser.add_argument('--ptk', '-t', default='1.00', metavar='ptk_version')
+parser.add_argument('--pypy', default=None, metavar='pypy_version')
+parser.add_argument('--ptk', '-t', default='2.0.4', metavar='ptk_version')
 parser.add_argument('--keep', action='store_true')
 parser.add_argument('--build', action='store_true')
 parser.add_argument('--command', '-c', default='xonsh',
@@ -32,6 +33,22 @@ RUN python setup.py install
     python_version=args.python,
     ptk_version=args.ptk)
 
+if args.pypy:
+    docker_script = """
+from pypy:{python_version}
+RUN pypy3 -m ensurepip
+RUN pip install --upgrade pip && pip install \\
+  ply \\
+  prompt-toolkit=={ptk_version} \\
+  pygments
+RUN mkdir /xonsh
+WORKDIR /xonsh
+ADD ./ ./
+RUN pypy3 setup.py install
+    """.format(
+        python_version=args.pypy,
+        ptk_version=args.ptk)
+
 print('Building and running Xonsh')
 print('Using python ', args.python)
 print('Using prompt-toolkit ', args.ptk)