bump version

.appveyor.yml

@@ -22,7 +22,7 @@ cache:
   - C:\Users\appveyor\AppData\Local\pip\cache
 deploy_script:
   ps: |
-    if($Env:APPVEYOR_REPO_BRANCH -match "master") {
+    if(($Env:APPVEYOR_REPO_BRANCH -match "master") -or ($Env:APPVEYOR_REPO_TAG -match "true")) {
     python .\release\rtool.py bdist
     python .\release\rtool.py upload-snapshot --bdist
     }

.travis.yml

@@ -53,7 +53,7 @@ script:
 after_success:
   - coveralls
   - |
-    if [[ $TRAVIS_OS_NAME == "osx" && $TRAVIS_BRANCH == "master" && $TRAVIS_PULL_REQUEST == "false" ]]
+    if [[ $TRAVIS_OS_NAME == "osx" && $TRAVIS_PULL_REQUEST == "false" && ($TRAVIS_BRANCH == "master" || -n $TRAVIS_TAG) ]]
     then
         pip install -e ./release
         python ./release/rtool.py bdist

netlib/version.py

@@ -1,6 +1,6 @@
 from __future__ import (absolute_import, print_function, division)
 
-IVERSION = (0, 17)
+IVERSION = (0, 17, 1)
 VERSION = ".".join(str(i) for i in IVERSION)
 NAME = "netlib"
 NAMEVERSION = NAME + " " + VERSION

release/rtool.py

@@ -311,7 +311,8 @@ def upload_snapshot(host, port, user, private_key, private_key_password, wheel,
                     # Delete old versions
                     old_version = f.replace(get_version(), "*")
                     for f_old in sftp.listdir():
-                        if fnmatch.fnmatch(f_old, old_version):
+                        not_a_tag = "-0x" in f_old
+                        if fnmatch.fnmatch(f_old, old_version) and not_a_tag:
                             print("Removing {}...".format(f_old))
                             sftp.remove(f_old)
 

setup.py

@@ -76,7 +76,7 @@ setup(
         "passlib>=1.6.5, <1.7",
         "pyasn1>=0.1.9, <0.2",
         "pyOpenSSL>=16.0, <17.0",
-        "pyparsing>=2.1,<2.2",
+        "pyparsing>=2.0,<2.1",  # 2.1.1 breaks our binaries, see https://sourceforge.net/p/pyparsing/bugs/93/
         "pyperclip>=1.5.22, <1.6",
         "requests>=2.9.1, <2.10",
         "six>=1.10, <1.11",

test/mitmproxy/test_filt.py

@@ -1,8 +1,6 @@
 from six.moves import cStringIO as StringIO
 from mitmproxy import filt
-from mitmproxy.models import Error
+from mock import patch
-from mitmproxy.models import http
-from netlib.http import Headers
 from . import tutils
 
 
@@ -247,3 +245,11 @@ class TestMatching:
         assert self.q("! ~c 201", s)
         assert self.q("!~c 201 !~c 202", s)
         assert not self.q("!~c 201 !~c 200", s)
+
+
+@patch('traceback.extract_tb')
+def test_pyparsing_bug(extract_tb):
+    """https://github.com/mitmproxy/mitmproxy/issues/1087"""
+    # The text is a string with leading and trailing whitespace stripped; if the source is not available it is None.
+    extract_tb.return_value = [("", 1, "test", None)]
+    assert filt.parse("test")