aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-02-13 11:16:03 +0100
committerGitHub <noreply@github.com>2017-02-13 11:16:02 +0100
commit9c29f3b96d13852b434396cd09c9e156d7d8668c (patch)
treef63fdacb86d511b4bb7312597a7868b7b5a91a15
parentf77cf03543d89a9503cd86fb48fe4d9d32b57190 (diff)
parent63cfb4e480257dfae0687bf16cb75b455b6d897e (diff)
downloadmitmproxy-9c29f3b96d13852b434396cd09c9e156d7d8668c.tar.gz
mitmproxy-9c29f3b96d13852b434396cd09c9e156d7d8668c.tar.bz2
mitmproxy-9c29f3b96d13852b434396cd09c9e156d7d8668c.zip
Merge pull request #2015 from Kriechi/nuke-pypy
nuke pypy
-rw-r--r--.travis.yml3
-rw-r--r--setup.py1
2 files changed, 1 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index e1ff4539..f534100b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ env:
- CI_COMMANDS=codecov
git:
depth: 10000
+
matrix:
fast_finish: true
include:
@@ -44,8 +45,6 @@ matrix:
- libssl-dev
- python: 3.5
env: TOXENV=docs
- allow_failures:
- - python: pypy
install:
- |
diff --git a/setup.py b/setup.py
index 0e41539a..17d45b42 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,6 @@ setup(
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: Implementation :: CPython",
- "Programming Language :: Python :: Implementation :: PyPy",
"Topic :: Security",
"Topic :: Internet",
"Topic :: Internet :: WWW/HTTP",