From ba652117ab248cccafc3cae6d7f615938bf26530 Mon Sep 17 00:00:00 2001
From: Christie Rice <8483753+crice100@users.noreply.github.com>
Date: Thu, 3 Jan 2019 14:58:28 -0500
Subject: [PATCH] INCR-31 INCR-38 Remove constraint on pysrt and run make
 upgrade

---
 requirements/edx/base.in         | 2 +-
 requirements/edx/base.txt        | 5 ++---
 requirements/edx/development.txt | 5 ++---
 requirements/edx/testing.txt     | 5 ++---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/requirements/edx/base.in b/requirements/edx/base.in
index 05b6918886..1fe9b35b0c 100644
--- a/requirements/edx/base.in
+++ b/requirements/edx/base.in
@@ -132,7 +132,7 @@ rest-condition                      # DRF's recommendation for supporting comple
 rfc6266-parser                      # Used to generate Content-Disposition headers.
 social-auth-app-django<3.0.0
 social-auth-core<2.0.0
-pysrt==0.4.7                        # Support for SubRip subtitle files, used in the video XModule
+pysrt                               # Support for SubRip subtitle files, used in the video XModule
 pytz                                # Time zone information database
 PyYAML                              # Used to parse XModule resource templates
 redis==2.10.6                       # celery task broker
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 1cfb82e406..255040f50b 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -59,7 +59,6 @@ botocore==1.8.17
 celery==3.1.25
 certifi==2018.11.29
 cffi==1.11.5
-charade==1.0.3            # via pysrt
 chardet==3.0.4
 click==7.0                # via user-util
 coreapi==2.3.3            # via django-rest-swagger, openapi-codec
@@ -183,7 +182,7 @@ paver==1.3.4
 pbr==5.1.1
 pdfminer==20140328
 piexif==1.0.2
-pillow==5.3.0
+pillow==5.4.0
 polib==1.1.0              # via edx-i18n-tools
 psutil==1.2.1
 py2neo==3.1.2
@@ -198,7 +197,7 @@ pyjwt==1.5.2
 pymongo==2.9.1
 pynliner==0.8.0
 pyparsing==2.2.0
-pysrt==0.4.7
+pysrt==1.1.1
 python-dateutil==2.4.0
 python-levenshtein==0.12.0
 python-memcached==1.48
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index e6a7c36aaf..63f74183c3 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -68,7 +68,6 @@ botocore==1.8.17
 celery==3.1.25
 certifi==2018.11.29
 cffi==1.11.5
-charade==1.0.3
 chardet==3.0.4
 click-log==0.1.8
 click==7.0
@@ -234,7 +233,7 @@ paver==1.3.4
 pbr==5.1.1
 pdfminer==20140328
 piexif==1.0.2
-pillow==5.3.0
+pillow==5.4.0
 pip-tools==3.2.0
 pluggy==0.8.0
 polib==1.1.0
@@ -265,7 +264,7 @@ pyopenssl==18.0.0
 pyparsing==2.2.0
 pyquery==1.4.0
 pysqlite==2.8.3
-pysrt==0.4.7
+pysrt==1.1.1
 pytest-attrib==0.1.3
 pytest-cov==2.5.1
 pytest-django==3.1.2
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index d0adb981e4..a025421fb5 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -65,7 +65,6 @@ botocore==1.8.17
 celery==3.1.25
 certifi==2018.11.29
 cffi==1.11.5
-charade==1.0.3
 chardet==3.0.4
 click-log==0.1.8          # via edx-lint
 click==7.0
@@ -225,7 +224,7 @@ paver==1.3.4
 pbr==5.1.1
 pdfminer==20140328
 piexif==1.0.2
-pillow==5.3.0
+pillow==5.4.0
 pluggy==0.8.0             # via pytest, tox
 polib==1.1.0
 psutil==1.2.1
@@ -254,7 +253,7 @@ pyopenssl==18.0.0         # via scrapy
 pyparsing==2.2.0
 pyquery==1.4.0
 pysqlite==2.8.3
-pysrt==0.4.7
+pysrt==1.1.1
 pytest-attrib==0.1.3
 pytest-cov==2.5.1
 pytest-django==3.1.2