From 946bc05187dc156d15eb25daccb6de64997fe57a Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Thu, 3 Dec 2015 17:57:29 +0100 Subject: use version specifiers compatible with old setuptools releases --- setup.py | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 34c7607b..897906b5 100644 --- a/setup.py +++ b/setup.py @@ -15,26 +15,25 @@ with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f: # Core dependencies deps = { "netlib>=%s, <%s" % (version.MINORVERSION, version.NEXT_MINORVERSION), - "pyasn1~=0.1.9", - "tornado~=4.3.0", - "configargparse~=0.10.0", - "pyperclip~=1.5.22", - "blinker~=1.4", - "pyparsing~=2.0.5", - "html2text~=2015.11.4", - "construct~=2.5.2", - "six~=1.10.0", - "lxml~=3.4.4", - "Pillow~=3.0.0", - "watchdog~=0.8.3", + "tornado>=4.3.0, <4.4", + "configargparse>=0.10.0, <0.11", + "pyperclip>=1.5.22, <1.6", + "blinker>=1.4, <1.5", + "pyparsing>=2.0.5, <2.1", + "html2text==2015.11.4", + "construct>=2.5.2, <2.6", + "six>=1.10.0, <1.11", + "lxml==3.4.4", # there are no Windows wheels for 3.5! + "Pillow>=3.0.0, <3.1", + "watchdog>=0.8.3, <0.9", } # A script -> additional dependencies dict. scripts = { "mitmproxy": { - "urwid~=1.3.1", + "urwid>=1.3.1, <1.4", }, "mitmdump": { - "click~=6.2", + "click>=6.2, <6.3", }, "mitmweb": set() } @@ -51,9 +50,9 @@ dev_deps = { "sphinxcontrib-documentedlist>=0.2", } example_deps = { - "pytz~=2015.7", - "harparser~=0.2", - "beautifulsoup4~=4.4.1", + "pytz==2015.7", + "harparser>=0.2, <0.3", + "beautifulsoup4>=4.4.1, <4.5", } # Add *all* script dependencies to developer dependencies. for script_deps in scripts.values(): @@ -62,14 +61,14 @@ for script_deps in scripts.values(): # Remove mitmproxy for Windows support. if os.name == "nt": del scripts["mitmproxy"] - deps.add("pydivert~=0.0.7") # Transparent proxying on Windows + deps.add("pydivert>=0.0.7") # Transparent proxying on Windows # Add dependencies for available scripts as core dependencies. for script_deps in scripts.values(): deps.update(script_deps) if sys.version_info < (3, 4): - example_deps.add("enum34~=1.0.4") + example_deps.add("enum34>=1.0.4, <1.1") console_scripts = ["%s = libmproxy.main:%s" % (s, s) for s in scripts.keys()] @@ -108,9 +107,9 @@ setup( extras_require={ 'dev': list(dev_deps), 'contentviews': [ - "pyamf~=0.7.2", - "protobuf~=2.6.1", - "cssutils~=1.0.1" + "pyamf>=0.7.2, <0.8", + "protobuf>=2.6.1, <2.7", + "cssutils>=1.0.1, <1.1" ], 'examples': list(example_deps) } -- cgit v1.2.3