Make upgrade after rebase

requirements/edx/base.in

@@ -80,7 +80,7 @@ edx-enterprise
 edx-milestones
 edx-oauth2-provider
 edx-organizations
-edx-proctoring==1.5.0rc3
+edx-proctoring>=1.5.0rc4
 edx-rest-api-client
 edx-search
 edx-submissions

requirements/edx/base.txt

@@ -94,7 +94,7 @@ django-require==1.0.11
 django-rest-swagger==2.2.0
 django-sekizai==0.10.0
 django-ses==0.8.4
-django-simple-history==2.5.1
+django-simple-history==2.6.0
 django-splash==0.2.2
 django-statici18n==1.4.0
 django-storages==1.4.1
@@ -118,28 +118,7 @@ edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
 edx-django-utils==1.0.3
 edx-drf-extensions==2.0.1
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 edx-enterprise==1.2.0
-=======
-=======
->>>>>>> Removed course-run exam rule configuration
-<<<<<<< HEAD
-edx-enterprise==1.1.2
-=======
-edx-enterprise==1.1.0
->>>>>>> make upgrade
-<<<<<<< HEAD
->>>>>>> make upgrade
-=======
-=======
-edx-enterprise==1.1.2
->>>>>>> Removed course-run exam rule configuration
->>>>>>> Removed course-run exam rule configuration
-=======
-edx-enterprise==1.1.2
->>>>>>> $ make upgrade
 edx-i18n-tools==0.4.6
 edx-milestones==0.1.13
 edx-oauth2-provider==1.2.2

requirements/edx/coverage.txt

@@ -10,10 +10,5 @@ inflect==2.1.0            # via jinja2-pluralize
 jinja2-pluralize==0.3.0   # via diff-cover
 jinja2==2.10              # via diff-cover, jinja2-pluralize
 markupsafe==1.1.0         # via jinja2
-<<<<<<< HEAD
 pygments==2.3.1           # via diff-cover
-six==1.11.0               # via diff-cover
-=======
-pygments==2.3.0           # via diff-cover
 six==1.11.0
->>>>>>> Removed course-run exam rule configuration

requirements/edx/development.txt

@@ -53,7 +53,6 @@ argh==0.26.2
 argparse==1.4.0
 asn1crypto==0.24.0
 astroid==1.5.3
-atomicwrites==1.2.1
 attrs==17.4.0
 babel==1.3
 backports.functools-lru-cache==1.5
@@ -113,7 +112,7 @@ django-require==1.0.11
 django-rest-swagger==2.2.0
 django-sekizai==0.10.0
 django-ses==0.8.4
-django-simple-history==2.5.1
+django-simple-history==2.6.0
 django-splash==0.2.2
 django-statici18n==1.4.0
 django-storages==1.4.1
@@ -137,28 +136,7 @@ edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
 edx-django-utils==1.0.3
 edx-drf-extensions==2.0.1
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 edx-enterprise==1.2.0
-=======
-=======
->>>>>>> Removed course-run exam rule configuration
-<<<<<<< HEAD
-edx-enterprise==1.1.2
-=======
-edx-enterprise==1.1.0
->>>>>>> make upgrade
-<<<<<<< HEAD
->>>>>>> make upgrade
-=======
-=======
-edx-enterprise==1.1.2
->>>>>>> Removed course-run exam rule configuration
->>>>>>> Removed course-run exam rule configuration
-=======
-edx-enterprise==1.1.2
->>>>>>> $ make upgrade
 edx-i18n-tools==0.4.6
 edx-lint==1.0.0
 edx-milestones==0.1.13
@@ -189,7 +167,6 @@ flask==1.0.2
 freezegun==0.3.11
 fs-s3fs==0.1.8
 fs==2.0.18
-funcsigs==1.0.2
 functools32==3.2.3.post2
 future==0.17.1
 futures==3.2.0 ; python_version == "2.7"
@@ -234,7 +211,6 @@ mccabe==0.6.1
 mock==1.0.1
 modernize==0.6.1
 mongoengine==0.10.0
-more-itertools==4.3.0
 moto==0.3.1
 mysql-python==1.2.5
 networkx==1.7
@@ -256,7 +232,7 @@ pdfminer==20140328
 piexif==1.0.2
 pillow==5.3.0
 pip-tools==3.2.0
-pluggy==0.6.0
+pluggy==0.8.0
 polib==1.1.0
 psutil==1.2.1
 py2neo==3.1.2

requirements/edx/pip-tools.txt

@@ -5,10 +5,5 @@
 #    make upgrade
 #
 click==7.0                # via pip-tools
-<<<<<<< HEAD
 pip-tools==3.2.0
-six==1.11.0               # via pip-tools
-=======
-pip-tools==3.1.0
 six==1.11.0
->>>>>>> Removed course-run exam rule configuration

requirements/edx/testing.txt

@@ -50,7 +50,6 @@ argh==0.26.2
 argparse==1.4.0
 asn1crypto==0.24.0
 astroid==1.5.3            # via edx-lint, pylint, pylint-celery
-atomicwrites==1.2.1       # via pytest
 attrs==17.4.0
 babel==1.3
 backports.functools-lru-cache==1.5  # via astroid, pylint
@@ -109,7 +108,7 @@ django-require==1.0.11
 django-rest-swagger==2.2.0
 django-sekizai==0.10.0
 django-ses==0.8.4
-django-simple-history==2.5.1
+django-simple-history==2.6.0
 django-splash==0.2.2
 django-statici18n==1.4.0
 django-storages==1.4.1
@@ -132,28 +131,7 @@ edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
 edx-django-utils==1.0.3
 edx-drf-extensions==2.0.1
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 edx-enterprise==1.2.0
-=======
-=======
->>>>>>> Removed course-run exam rule configuration
-<<<<<<< HEAD
-edx-enterprise==1.1.2
-=======
-edx-enterprise==1.1.0
->>>>>>> make upgrade
-<<<<<<< HEAD
->>>>>>> make upgrade
-=======
-=======
-edx-enterprise==1.1.2
->>>>>>> Removed course-run exam rule configuration
->>>>>>> Removed course-run exam rule configuration
-=======
-edx-enterprise==1.1.2
->>>>>>> $ make upgrade
 edx-i18n-tools==0.4.6
 edx-lint==1.0.0
 edx-milestones==0.1.13
@@ -183,7 +161,6 @@ flask==1.0.2              # via moto
 freezegun==0.3.11
 fs-s3fs==0.1.8
 fs==2.0.18
-funcsigs==1.0.2           # via pytest
 functools32==3.2.3.post2  # via parsel
 future==0.17.1
 futures==3.2.0 ; python_version == "2.7"
@@ -226,7 +203,6 @@ markupsafe==1.1.0
 mccabe==0.6.1             # via flake8, pylint
 mock==1.0.1
 mongoengine==0.10.0
-more-itertools==4.3.0     # via pytest
 moto==0.3.1
 mysql-python==1.2.5
 networkx==1.7
@@ -246,11 +222,11 @@ pbr==5.1.1
 pdfminer==20140328
 piexif==1.0.2
 pillow==5.3.0
-pluggy==0.6.0             # via pytest, tox
+pluggy==0.8.0             # via tox
 polib==1.1.0
 psutil==1.2.1
 py2neo==3.1.2
-py==1.7.0                 # via pytest, tox
+py==1.7.0                 # via tox
 pyasn1-modules==0.2.2     # via service-identity
 pyasn1==0.4.4             # via pyasn1-modules, service-identity
 pycodestyle==2.4.0
@@ -267,7 +243,7 @@ pyjwt==1.5.2
 pylint-celery==0.3        # via edx-lint
 pylint-django==0.7.2      # via edx-lint
 pylint-plugin-utils==0.3  # via pylint-celery, pylint-django
-pylint==1.7.6             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
+pylint==1.7.6             # via edx-lint, pylint-celery, pylint-django
 pymongo==2.9.1
 pynliner==0.8.0
 pyopenssl==18.0.0         # via scrapy