diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-12-11 21:13:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-11 21:13:20 +0100 |
| commit | a7d7ad28802d9c4f4490f2f8a24088113feffab7 (patch) | |
| tree | 0d2d0ee4594ce1b8dee162a2a9ce1d4ba8340a29 | |
| parent | f16aab963e20a6c2fa2f63d7841b71f6d068783f (diff) | |
| parent | 00ae4d3f6e993b06b808cf08e0441fcbacff4f16 (diff) | |
| download | mitmproxy-a7d7ad28802d9c4f4490f2f8a24088113feffab7.tar.gz mitmproxy-a7d7ad28802d9c4f4490f2f8a24088113feffab7.tar.bz2 mitmproxy-a7d7ad28802d9c4f4490f2f8a24088113feffab7.zip | |
Merge pull request #1837 from mhils/1809
Fix #1809
| -rw-r--r-- | mitmproxy/__init__.py | 3 | ||||
| -rw-r--r-- | setup.py | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/mitmproxy/__init__.py b/mitmproxy/__init__.py index e69de29b..9697de87 100644 --- a/mitmproxy/__init__.py +++ b/mitmproxy/__init__.py @@ -0,0 +1,3 @@ +# https://github.com/mitmproxy/mitmproxy/issues/1809 +# import script here so that pyinstaller registers it. +from . import script # noqa @@ -1,8 +1,8 @@ -from setuptools import setup, find_packages -from codecs import open 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 # 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: long_description = f.read() +VERSION = runpy.run_path(os.path.join(here, "mitmproxy", "version.py"))["VERSION"] + setup( name="mitmproxy", - version=version.VERSION, + version=VERSION, description="An interactive, SSL-capable, man-in-the-middle HTTP proxy for penetration testers and software developers.", long_description=long_description, url="http://mitmproxy.org", |