Merge pull request #301 from mitocw/develop

Merging develop to master
mitocw · Nov 10, 2021 · d53fdd6 · d53fdd6
2 parents 5446a28 + aa7f8a6
commit d53fdd6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 2 deletions.
diff --git a/lms/djangoapps/dashboard/sysadmin.py b/lms/djangoapps/dashboard/sysadmin.py
@@ -10,7 +10,7 @@
 import subprocess
 
 import mongoengine
-import unicodecsv as csv
+import csv
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User

diff --git a/requirements/edx/base.in b/requirements/edx/base.in
@@ -112,7 +112,6 @@ openedx-calc                        # Library supporting mathematical calculatio
 pdfminer.six                        # Used in shoppingcart for extracting/parsing pdf text
 piexif                              # Exif image metadata manipulation, used in the profile_images app
 Pillow                              # Image manipulation library; used for course assets, profile images, invoice PDFs, etc.
-py2neo<4.0.0                        # Used to communicate with Neo4j, which is used internally for modulestore inspection
 PyContracts
 pycountry
 pycryptodomex

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -21,6 +21,7 @@
 -e common/lib/symmath  # via -r requirements/edx/local.in
 -e openedx/core/lib/xblock_builtin/xblock_discussion  # via -r requirements/edx/local.in
 -e git+https://github.com/edx-solutions/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive  # via -r requirements/edx/github.in
+-e git+https://github.com/technige/[email protected]#egg=py2neo==3.1.2  # via -r requirements/edx/github.in
 -e common/lib/xmodule  # via -r requirements/edx/local.in
 amqp==1.4.9               # via kombu
 analytics-python==1.2.9   # via -r requirements/edx/base.in

diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
@@ -22,6 +22,7 @@
 -e openedx/core/lib/xblock_builtin/xblock_discussion  # via -r requirements/edx/testing.txt
 -e git+https://github.com/edx-solutions/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive  # via -r requirements/edx/testing.txt
 -e common/lib/xmodule  # via -r requirements/edx/testing.txt
+-e git+https://github.com/technige/[email protected]#egg=py2neo==3.1.2  # via -r requirements/edx/github.in
 alabaster==0.7.12         # via sphinx
 amqp==1.4.9               # via -r requirements/edx/testing.txt, kombu
 analytics-python==1.2.9   # via -r requirements/edx/testing.txt

diff --git a/requirements/edx/github.in b/requirements/edx/github.in
@@ -76,6 +76,8 @@ git+https://github.com/Zegocover/enmerkar.git@dbc113798aa4beabdfa2d00e6fef48248e
 # This can be removed once an official social-auth-app-django Pypi release with Django 2.2 support is available in the future.
 -e git+https://github.com/python-social-auth/social-app-django.git@c00d23c2b45c3317bd35b15ad1b959338689cef8#egg=social-auth-app-django
 
+-e git+https://github.com/technige/[email protected]#egg=py2neo==3.1.2
+
 # Why install sorl-thumbnail directly from github? To use a Django 2.2 compatible version before Python 3.5 support was dropped
 git+https://github.com/jazzband/sorl-thumbnail.git@13bedfb7d2970809eda597e3ef79318a6fa80ac2#egg=sorl-thumbnail
 

diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
@@ -21,6 +21,7 @@
 -e common/lib/symmath  # via -r requirements/edx/base.txt
 -e openedx/core/lib/xblock_builtin/xblock_discussion  # via -r requirements/edx/base.txt
 -e git+https://github.com/edx-solutions/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive  # via -r requirements/edx/base.txt
+-e git+https://github.com/technige/[email protected]#egg=py2neo==3.1.2  # via -r requirements/edx/base.txt
 -e common/lib/xmodule  # via -r requirements/edx/base.txt
 amqp==1.4.9               # via -r requirements/edx/base.txt, kombu
 analytics-python==1.2.9   # via -r requirements/edx/base.txt