From 08222f1acb8b0c4593b733f8e3239916d00b4e4a Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Fri, 7 Dec 2018 12:10:47 -0500 Subject: [PATCH] make upgrade --- requirements/edx-sandbox/shared.txt | 4 ++++ requirements/edx/base.txt | 12 ++++++++++++ requirements/edx/development.txt | 12 ++++++++++++ requirements/edx/testing.txt | 12 ++++++++++++ 4 files changed, 40 insertions(+) diff --git a/requirements/edx-sandbox/shared.txt b/requirements/edx-sandbox/shared.txt index adc8434188..ccd80c82bd 100644 --- a/requirements/edx-sandbox/shared.txt +++ b/requirements/edx-sandbox/shared.txt @@ -12,7 +12,11 @@ asn1crypto==0.24.0 # via cryptography cffi==1.11.5 # via cryptography cryptography==2.4.2 enum34==1.1.6 # via cryptography +<<<<<<< HEAD idna==2.8 # via cryptography +======= +idna==2.7 +>>>>>>> make upgrade ipaddress==1.0.22 # via cryptography lxml==3.8.0 markupsafe==1.1.0 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 1187d01391..15a1c6bfcc 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -118,7 +118,15 @@ 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 edx-enterprise==1.2.0 +======= +<<<<<<< HEAD +edx-enterprise==1.1.2 +======= +edx-enterprise==1.1.0 +>>>>>>> make upgrade +>>>>>>> make upgrade edx-i18n-tools==0.4.6 edx-milestones==0.1.13 edx-oauth2-provider==1.2.2 @@ -186,10 +194,14 @@ mongoengine==0.10.0 mysql-python==1.2.5 networkx==1.7 <<<<<<< HEAD +<<<<<<< HEAD newrelic==4.8.0.110 ======= newrelic==4.6.0.106 >>>>>>> Enable course run level overrides for proctoring configuration. +======= +newrelic==4.8.0.110 +>>>>>>> make upgrade nltk==3.4 nodeenv==1.1.1 numpy==1.6.2 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 2e1292fc2a..9fa2393ec7 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -137,7 +137,15 @@ 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 edx-enterprise==1.2.0 +======= +<<<<<<< HEAD +edx-enterprise==1.1.2 +======= +edx-enterprise==1.1.0 +>>>>>>> make upgrade +>>>>>>> make upgrade edx-i18n-tools==0.4.6 edx-lint==1.0.0 edx-milestones==0.1.13 @@ -230,10 +238,14 @@ moto==0.3.1 mysql-python==1.2.5 networkx==1.7 <<<<<<< HEAD +<<<<<<< HEAD newrelic==4.8.0.110 ======= newrelic==4.6.0.106 >>>>>>> Enable course run level overrides for proctoring configuration. +======= +newrelic==4.8.0.110 +>>>>>>> make upgrade nltk==3.4 nodeenv==1.1.1 numpy==1.6.2 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 41443cc186..edc26a17f6 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -132,7 +132,15 @@ 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 edx-enterprise==1.2.0 +======= +<<<<<<< HEAD +edx-enterprise==1.1.2 +======= +edx-enterprise==1.1.0 +>>>>>>> make upgrade +>>>>>>> make upgrade edx-i18n-tools==0.4.6 edx-lint==1.0.0 edx-milestones==0.1.13 @@ -222,10 +230,14 @@ moto==0.3.1 mysql-python==1.2.5 networkx==1.7 <<<<<<< HEAD +<<<<<<< HEAD newrelic==4.8.0.110 ======= newrelic==4.6.0.106 >>>>>>> Enable course run level overrides for proctoring configuration. +======= +newrelic==4.8.0.110 +>>>>>>> make upgrade nltk==3.4 nodeenv==1.1.1 numpy==1.6.2