chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
36ef935
)
Merge branch 'mr/update_docker-py' into 'master'
author
Hans-Christoph Steiner
<hans@guardianproject.info>
Thu, 31 Aug 2017 12:48:18 +0000
(12:48 +0000)
committer
Hans-Christoph Steiner
<hans@guardianproject.info>
Thu, 31 Aug 2017 12:48:18 +0000
(12:48 +0000)
setup.py: unstick docker-py and requests dependencies
See merge request !318
setup.py
patch
|
blob
|
history
diff --git
a/setup.py
b/setup.py
index 12e2476b00ac2448c1d510a1e96465796706cb55..6ee8c3a8b60dbe19eaabd5424820e1032589f765 100644
(file)
--- a/
setup.py
+++ b/
setup.py
@@
-41,8
+41,8
@@
setup(name='fdroidserver',
'python-vagrant',
'PyYAML',
'ruamel.yaml >= 0.13',
- 'requests
< 2.11
',
- 'docker-py
== 1.9
.0',
+ 'requests
>= 2.5.2, != 2.11.0, != 2.12.2, != 2.18.0
',
+ 'docker-py
>= 1.9, < 2
.0',
],
classifiers=[
'Development Status :: 4 - Beta',