Merge pull request #1837 from mhils/1809

Fix #1809
This commit is contained in:
Maximilian Hils 2016-12-11 21:13:20 +01:00 committed by GitHub
commit a7d7ad2880
2 changed files with 9 additions and 4 deletions

View File

@ -0,0 +1,3 @@
# https://github.com/mitmproxy/mitmproxy/issues/1809
# import script here so that pyinstaller registers it.
from . import script # noqa

View File

@ -1,8 +1,8 @@
from setuptools import setup, find_packages
from codecs import open
import os import os
import runpy
from codecs import open
from mitmproxy import version from setuptools import setup, find_packages
# Based on https://github.com/pypa/sampleproject/blob/master/setup.py # Based on https://github.com/pypa/sampleproject/blob/master/setup.py
# and https://python-packaging-user-guide.readthedocs.org/ # and https://python-packaging-user-guide.readthedocs.org/
@ -12,9 +12,11 @@ here = os.path.abspath(os.path.dirname(__file__))
with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f: with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
long_description = f.read() long_description = f.read()
VERSION = runpy.run_path(os.path.join(here, "mitmproxy", "version.py"))["VERSION"]
setup( setup(
name="mitmproxy", name="mitmproxy",
version=version.VERSION, version=VERSION,
description="An interactive, SSL-capable, man-in-the-middle HTTP proxy for penetration testers and software developers.", description="An interactive, SSL-capable, man-in-the-middle HTTP proxy for penetration testers and software developers.",
long_description=long_description, long_description=long_description,
url="http://mitmproxy.org", url="http://mitmproxy.org",