sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix up requirements=minimal

Browse source
This commit is contained in:
Markus Unterwaditzer 2016-03-04 08:23:32 +01:00
parent cd07d7fc68
commit 48a649ee8c
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -79,7 +79,15 @@ install-dev:
set -xe && if [ "$$REQUIREMENTS" = "devel" ]; then \ set -xe && if [ "$$REQUIREMENTS" = "devel" ]; then \
pip install -U --force-reinstall git+https://github.com/kennethreitz/requests; \ pip install -U --force-reinstall git+https://github.com/kennethreitz/requests; \
elif [ "$$REQUIREMENTS" = "minimal" ]; then \ 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 fi
.PHONY: docs .PHONY: docs

11
setup.py
View file

@ -35,10 +35,10 @@ setup(
install_requires=[ install_requires=[
# https://github.com/mitsuhiko/click/issues/200 # https://github.com/mitsuhiko/click/issues/200
'click>=5.0', 'click>=5.0',
'click-log', 'click-log>=0.1.3',
'click-threading', 'click-threading>=0.1.2',
# https://github.com/kennethreitz/requests/issues/2930 # https://github.com/kennethreitz/requests/issues/2930
'requests !=2.9.0', 'requests >=2.0.1, !=2.9.0',
'lxml >=3.1' + ( 'lxml >=3.1' + (
# See https://github.com/untitaker/vdirsyncer/issues/298 # See https://github.com/untitaker/vdirsyncer/issues/298
# We pin some LXML version that is known to work with PyPy # We pin some LXML version that is known to work with PyPy
@ -49,8 +49,9 @@ setup(
else '' else ''
), ),
# https://github.com/sigmavirus24/requests-toolbelt/pull/28 # https://github.com/sigmavirus24/requests-toolbelt/pull/28
'requests_toolbelt >=0.5.0', 'requests_toolbelt >=0.3.0',
'atomicwrites>=0.1.6' # https://github.com/untitaker/python-atomicwrites/commit/4d12f23227b6a944ab1d99c507a69fdbc7c9ed6d # noqa
'atomicwrites>=0.1.7'
], ],
extras_require={ extras_require={
'remotestorage': ['requests-oauthlib'] 'remotestorage': ['requests-oauthlib']