diff --git a/Makefile b/Makefile index 4da8219..8dcbbc3 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,15 @@ install-dev: set -xe && if [ "$$REQUIREMENTS" = "devel" ]; then \ pip install -U --force-reinstall git+https://github.com/kennethreitz/requests; \ elif [ "$$REQUIREMENTS" = "minimal" ]; then \ - pip install -U --force-reinstall lxml==3.1 requests==2.4.1 requests_toolbelt==0.4.0 click==5.0; \ + # FIXME: Looking for a tool that parses setup.py requirements and installs minimum viable version + pip install -U --force-reinstall \ + lxml==3.1 \ + requests==2.0.1 \ + requests_toolbelt==0.4.0 \ + click-threading==0.1.2 \ + click-log==0.1.3 \ + atomicwrites==0.1.7 \ + click==5.0; \ fi .PHONY: docs diff --git a/setup.py b/setup.py index 6831bad..4e3dab9 100644 --- a/setup.py +++ b/setup.py @@ -35,10 +35,10 @@ setup( install_requires=[ # https://github.com/mitsuhiko/click/issues/200 'click>=5.0', - 'click-log', - 'click-threading', + 'click-log>=0.1.3', + 'click-threading>=0.1.2', # https://github.com/kennethreitz/requests/issues/2930 - 'requests !=2.9.0', + 'requests >=2.0.1, !=2.9.0', 'lxml >=3.1' + ( # See https://github.com/untitaker/vdirsyncer/issues/298 # We pin some LXML version that is known to work with PyPy @@ -49,8 +49,9 @@ setup( else '' ), # https://github.com/sigmavirus24/requests-toolbelt/pull/28 - 'requests_toolbelt >=0.5.0', - 'atomicwrites>=0.1.6' + 'requests_toolbelt >=0.3.0', + # https://github.com/untitaker/python-atomicwrites/commit/4d12f23227b6a944ab1d99c507a69fdbc7c9ed6d # noqa + 'atomicwrites>=0.1.7' ], extras_require={ 'remotestorage': ['requests-oauthlib']