1
0
Fork 0

Update requirements, fix 'urllib3' version conflict

Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>
merge-requests/375/head
Vasilis Tsiligiannis 2019-04-26 15:06:21 +03:00
parent 8c3debcc43
commit f0856840f7
3 changed files with 16 additions and 13 deletions

View File

@ -10,7 +10,7 @@ attrs==19.1.0
coverage==4.5.3
docopt==0.6.1
docopts==0.6.1
execnet==1.5.0
execnet==1.6.0
factory-boy==2.11.1
Faker==0.8.18
funcsigs==1.0.2
@ -20,9 +20,9 @@ more-itertools==5.0.0
pathlib2==2.3.3
pbr==5.1.3
pluggy==0.9.0
pur==5.2.1
pur==5.2.2
py==1.8.0
pytest==4.3.1
pytest==4.4.1
pytest-cov==2.6.1
pytest-django==3.4.8
pytest-forked==0.2

View File

@ -3,7 +3,6 @@
# Please edit 'setup.cfg' to add top-level dependencies and use
# './contrib/refresh-requirements.sh to regenerate this file
satnogsdecoders~=0.0
amqp==2.4.2
billiard==3.5.0.5
celery==4.1.1
@ -29,28 +28,29 @@ eventlet==0.24.1
greenlet==0.4.15
gunicorn==19.9.0
idna==2.8
influxdb==5.2.1
influxdb==5.2.2
kaitaistruct==0.8
kombu==4.4.0
lxml==4.3.2
kombu==4.5.0
lxml==4.3.3
Markdown==2.6.11
monotonic==1.5
mysqlclient==1.3.14
oauthlib==3.0.1
Pillow==5.4.1
Pillow==6.0.0
PyJWT==1.7.1
python-dateutil==2.8.0
python-decouple==3.1
python-dotenv==0.6.5
python-openid==2.2.5
pytz==2018.9
pytz==2019.1
rcssmin==1.0.6
redis==3.2.0
redis==3.2.1
requests==2.21.0
requests-oauthlib==1.2.0
rjsmin==1.0.12
satellitetle==0.5.1
sentry-sdk==0.7.6
satnogsdecoders~=0.0
sentry-sdk==0.7.12
sgp4==1.4
shortuuid==0.5.0
simplejson==3.16.0
@ -58,5 +58,5 @@ six==1.12.0
social-auth-app-django==1.2.0
social-auth-core==3.1.0
Unipath==1.1
urllib3==1.24.1
vine==1.2.0
urllib3==1.24.2
vine==1.3.0

View File

@ -61,6 +61,9 @@ install_requires =
influxdb~=5.2.0
satnogsdecoders~=0.0
simplejson~=3.16.0
# Conflict workarounds
# django-allauth - sentry-sdk
urllib3<1.25
[options.extras_require]
dev =