make upgrade

requirements/edx/base.txt

@@ -208,7 +208,7 @@ pyuca==1.1
 pyyaml==5.1.2
 git+https://github.com/edx/RecommenderXBlock.git@1.4.1#egg=recommender-xblock==1.4.1
 redis==2.10.6
-reportlab==3.5.23
+reportlab==3.5.26
 requests-oauthlib==1.1.0
 requests==2.22.0
 rest-condition==1.0.3

requirements/edx/development.txt

@@ -58,12 +58,8 @@ click-log==0.3.2
 click==7.0
 code-annotations==0.3.2
 colorama==0.4.1
-<<<<<<< HEAD
-configparser==4.0.2
-=======
 commonmark==0.9.0         # via recommonmark
-configparser==3.8.1
->>>>>>> make upgrade
+configparser==4.0.2
 contextlib2==0.5.5
 cookies==2.2.1
 coreapi==2.3.3
@@ -193,7 +189,6 @@ jmespath==0.9.4
 jsondiff==1.1.1
 jsonfield==2.0.2
 jsonpickle==1.2
-jsonschema==3.0.2
 kombu==3.0.37
 laboratory==1.0.2
 lazy-object-proxy==1.4.2
@@ -203,7 +198,6 @@ libsass==0.10.0
 loremipsum==1.0.5
 git+https://github.com/edx/xblock-lti-consumer.git@v1.1.8#egg=lti_consumer-xblock==1.1.8
 lxml==3.8.0
-m2r==0.2.1
 mailsnake==1.6.4
 mako==1.0.2
 mando==0.6.4
@@ -212,7 +206,6 @@ markey==0.8
 markupsafe==1.1.1
 maxminddb==1.4.1
 mccabe==0.6.1
-mistune==0.8.4            # via m2r
 mock==1.0.1
 modernize==0.7
 git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2
@@ -266,7 +259,6 @@ pymongo==2.9.1
 pynliner==0.8.0
 pyparsing==2.2.0
 pyquery==1.4.0
-pyrsistent==0.15.4        # via jsonschema
 pysqlite==2.8.3 ; python_version == "2.7"
 pysrt==1.1.1
 pytest-attrib==0.1.3
@@ -291,7 +283,7 @@ radon==3.0.3
 git+https://github.com/edx/RecommenderXBlock.git@1.4.1#egg=recommender-xblock==1.4.1
 recommonmark==0.6.0
 redis==2.10.6
-reportlab==3.5.23
+reportlab==3.5.26
 requests-oauthlib==1.1.0
 requests==2.22.0
 rest-condition==1.0.3
@@ -319,7 +311,6 @@ sorl-thumbnail==12.3
 sortedcontainers==2.1.0
 soupsieve==1.9.3
 sphinx==1.8.5
-sphinxcontrib-httpdomain==1.7.0
 sphinxcontrib-websupport==1.1.2  # via sphinx
 sqlparse==0.3.0
 staff-graded-xblock==0.5
@@ -360,4 +351,4 @@ xss-utils==0.1.1
 zipp==0.6.0
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.2.0        # via caniusepython3, fs, jsonschema, lazy, pytest, python-levenshtein, sphinx
+# setuptools==41.2.0        # via caniusepython3, fs, lazy, pytest, python-levenshtein, sphinx

requirements/edx/testing.txt

@@ -273,7 +273,7 @@ pyyaml==5.1.2
 radon==3.0.3
 git+https://github.com/edx/RecommenderXBlock.git@1.4.1#egg=recommender-xblock==1.4.1
 redis==2.10.6
-reportlab==3.5.23
+reportlab==3.5.26
 requests-oauthlib==1.1.0
 requests==2.22.0
 rest-condition==1.0.3