Skip to content

Commit

Permalink
Merge branch 'develop' into rjsmin
Browse files Browse the repository at this point in the history
  • Loading branch information
nmanovic authored Jun 18, 2020
2 parents 288f2b4 + 408c475 commit 1c987c0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions cvat/requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
click==6.7
Django==2.2.13
django-appconf==1.0.4
django-auth-ldap==1.4.0
django-auth-ldap==2.2.0
django-cacheops==5.0
django-compressor==2.4
django-rq==2.0.0
Expand All @@ -10,11 +10,11 @@ Pillow==7.1.2
numpy==1.18.5
python-ldap==3.2.0
pytz==2020.1
pyunpack==0.1.2
pyunpack==0.2.1
rcssmin==1.0.6
redis==3.2.0
requests==2.23.0
rjsmin==1.1.0
requests==2.24.0
rq==1.0.0
rq-scheduler==0.10.0
scipy==1.4.1
Expand Down Expand Up @@ -42,7 +42,7 @@ tensorflow==1.15.2
keras==2.3.1
opencv-python==4.1.0.25
h5py==2.9.0
imgaug==0.2.9
imgaug==0.4.0
django-cors-headers==3.3.0
furl==2.0.0
av==6.2.0
Expand Down
2 changes: 1 addition & 1 deletion cvat/requirements/production.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
-r base.txt
psycopg2-binary==2.8.5
mod-wsgi==4.6.2
mod-wsgi==4.7.1
2 changes: 1 addition & 1 deletion cvat/requirements/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
fakeredis==1.4.1
# Fix dependencies for fakeredis 1.1.0
# Pip will not reinstall six package if it is installed already
six==1.12.0
six==1.15.0
coveralls

0 comments on commit 1c987c0

Please sign in to comment.