Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make upgrade

Browse Source
This commit is contained in:
Ned Batchelder
2018-12-07 12:10:47 -05:00
committed by Dave St.Germain
parent 91b9478755
commit 08222f1acb
4 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
requirements/edx-sandbox/shared.txt
View File

@@ -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

12
requirements/edx/base.txt
View File

@@ -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

12
requirements/edx/development.txt
View File

@@ -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

12
requirements/edx/testing.txt
View File

@@ -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