Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-26 02:10:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4218 from Kriechi/semver-bump

Browse Source 
semver bump
This commit is contained in:
Thomas Kriechbaumer 2020-10-06 23:50:25 +02:00 committed by GitHub
commit 25469d4e92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -2,6 +2,7 @@ Unreleased: mitmproxy next
** Full Changelog ** ** Full Changelog **
* Support for Python 3.9 (@mhils)
* Add MsgPack content viewer (@tasn) * Add MsgPack content viewer (@tasn)
* Use `@charset` to decode CSS files if available (@prinzhorn) * Use `@charset` to decode CSS files if available (@prinzhorn)
* Fix links to anticache docs in mitmweb and use HTTPS for links to documentation (@rugk) * Fix links to anticache docs in mitmweb and use HTTPS for links to documentation (@rugk)

8
mitmproxy/tools/main.py
View File

@ -11,11 +11,11 @@ if sys.version_info < (3, 6):
# This must be before any mitmproxy imports, as they already break! # This must be before any mitmproxy imports, as they already break!
# Keep all other imports below with the 'noqa' magic comment. # Keep all other imports below with the 'noqa' magic comment.
print("#" * 76, file=sys.stderr) print("#" * 76, file=sys.stderr)
print("# mitmproxy requires Python 3.6 or higher! #", file=sys.stderr) print("# mitmproxy requires Python 3.6 or higher! #", file=sys.stderr)
print("#" + " " * 74 + "#", file=sys.stderr) print("#" + " " * 74 + "#", file=sys.stderr)
print("# Please upgrade your Python intepreter or use our mitmproxy binaries from #", file=sys.stderr) print("# Please upgrade your Python interpreter or use our mitmproxy binaries from #", file=sys.stderr)
print("# https://mitmproxy.org. If your operating system does not include the #", file=sys.stderr) print("# https://mitmproxy.org. If your operating system does not include the #", file=sys.stderr)
print("# required Python version, you can try using pyenv or similar tools. #", file=sys.stderr) print("# required Python version, you can try using pyenv or similar tools. #", file=sys.stderr)
print("#" * 76, file=sys.stderr) print("#" * 76, file=sys.stderr)
sys.exit(1) sys.exit(1)
else: else:

12
setup.py
View File

@ -69,8 +69,8 @@ setup(
"click>=7.0,<8", "click>=7.0,<8",
"cryptography>=3.0,<3.1.1", "cryptography>=3.0,<3.1.1",
"flask>=1.1.1,<1.2", "flask>=1.1.1,<1.2",
"h2>=3.2.0,<4", "h2>=4.0,<5; python_version>='3.6.0'", # python_version only needed to make "py36+ required" message work
"hyperframe>=5.1.0,<6", "hyperframe>=6.0,<7; python_version>='3.6.0'", # python_version only needed to make "py36+ required" message work
"kaitaistruct>=0.7,<0.9", "kaitaistruct>=0.7,<0.9",
"ldap3>=2.8,<2.9", "ldap3>=2.8,<2.9",
"msgpack>=1.0.0, <1.1.0", "msgpack>=1.0.0, <1.1.0",
@ -98,15 +98,15 @@ setup(
'dev': [ 'dev': [
"asynctest>=0.12.0", "asynctest>=0.12.0",
"Flask>=1.0,<1.2", "Flask>=1.0,<1.2",
"hypothesis>=5.8,<5.30", "hypothesis>=5.8,<6",
"parver>=0.1,<2.0", "parver>=0.1,<2.0",
"pytest-asyncio>=0.10.0,<0.14,!=0.14", "pytest-asyncio>=0.10.0,<0.14,!=0.14",
"pytest-cov>=2.7.1,<3", "pytest-cov>=2.7.1,<3",
"pytest-timeout>=1.3.3,<2", "pytest-timeout>=1.3.3,<2",
"pytest-xdist>=1.29,<2.2", "pytest-xdist>=2.1.0,<3",
"pytest>=5.1.3,<7", "pytest>=6.1.0,<7",
"requests>=2.9.1,<3", "requests>=2.9.1,<3",
"tox>=3.5,<3.20", "tox>=3.5,<4",
] ]
} }
) )

2
tox.ini
View File

@ -23,7 +23,7 @@ commands =
bash -c "mitmdump --version 2>&1 | grep 'mitmproxy requires Python 3.6'" bash -c "mitmdump --version 2>&1 | grep 'mitmproxy requires Python 3.6'"
[testenv:flake8] [testenv:flake8]
deps = flake8==3.8.3 deps = flake8==3.8.4
commands = commands =
flake8 --jobs 8 mitmproxy pathod examples test release flake8 --jobs 8 mitmproxy pathod examples test release