diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-07-15 23:17:57 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-07-15 23:17:57 -0700 |
| commit | 3602fd7a36d963311339ab11ed36ff00df860f71 (patch) | |
| tree | 5834a98b35c02639c876544bc645f205068fac99 /release | |
| parent | a3c7c84d49c3e6563e7f37ef60c989f99ed96788 (diff) | |
| parent | 17305643bc482c0b185eec5c64d506790cd26587 (diff) | |
| download | mitmproxy-3602fd7a36d963311339ab11ed36ff00df860f71.tar.gz mitmproxy-3602fd7a36d963311339ab11ed36ff00df860f71.tar.bz2 mitmproxy-3602fd7a36d963311339ab11ed36ff00df860f71.zip | |
Merge remote-tracking branch 'origin/master' into message-body-encoding
Diffstat (limited to 'release')
| -rwxr-xr-x | release/rtool.py | 2 | ||||
| -rw-r--r-- | release/setup.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/release/rtool.py b/release/rtool.py index 04e1249d..4e43eaef 100755 --- a/release/rtool.py +++ b/release/rtool.py @@ -76,7 +76,7 @@ def get_snapshot_version(): return "{version}dev{tag_dist:04}-0x{commit}".format( version=get_version(), # this should already be the next version tag_dist=tag_dist, - commit=commit + commit=commit.decode() ) diff --git a/release/setup.py b/release/setup.py index 9876af0a..78155140 100644 --- a/release/setup.py +++ b/release/setup.py @@ -10,7 +10,7 @@ setup( "virtualenv>=14.0.5, <14.1", "wheel>=0.29.0, <0.30", "six>=1.10.0, <1.11", - "pysftp>=0.2.8, <0.3", + "pysftp>=0.2.8, !=0.2.9, <0.3", ], entry_points={ "console_scripts": [ |