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

Merge pull request #19705 from edx/youngstrom/incr-improvements

Browse Source 
INCR-17: Unpin and upgrade sortedcontainers for python3 support
This commit is contained in:
Michael Youngstrom
2019-02-22 14:38:14 -05:00
committed by GitHub
parent e3d08a7b84 9631fc2f88
commit fff3417efe
7 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
common/lib/xmodule/xmodule/modulestore/__init__.py
View File

@@ -12,7 +12,7 @@ from collections import defaultdict
from contextlib import contextmanager
import threading
from operator import itemgetter
from sortedcontainers import SortedListWithKey
from sortedcontainers import SortedKeyList
from abc import ABCMeta, abstractmethod
from contracts import contract, new_contract
@@ -509,7 +509,7 @@ class IncorrectlySortedList(Exception):
pass
class SortedAssetList(SortedListWithKey):
class SortedAssetList(SortedKeyList):
"""
List of assets that is sorted based on an asset attribute.
"""
@@ -549,12 +549,11 @@ class SortedAssetList(SortedListWithKey):
"""
metadata_to_insert = asset_md.to_storable()
asset_idx = self.find(asset_md.asset_id)
if asset_idx is None:
# Add new metadata sorted into the list.
self.add(metadata_to_insert)
else:
# Replace existing metadata.
self[asset_idx] = metadata_to_insert
if asset_idx is not None:
# Delete existing metadata.
del self[asset_idx]
# Add new metadata sorted into the list.
self.add(metadata_to_insert)
class ModuleStoreAssetBase(object):
@@ -575,10 +574,7 @@ class ModuleStoreAssetBase(object):
- the index of asset in list (None if asset does not exist)
"""
course_assets = self._find_course_assets(asset_key.course_key)
all_assets = SortedAssetList(iterable=[])
# Assets should be pre-sorted, so add them efficiently without sorting.
# extend() will raise a ValueError if the passed-in list is not sorted.
all_assets.extend(course_assets.setdefault(asset_key.block_type, []))
all_assets = SortedAssetList(iterable=course_assets.setdefault(asset_key.block_type, []))
idx = all_assets.find(asset_key)
return course_assets, idx

2
common/lib/xmodule/xmodule/modulestore/mongo/base.py
View File

@@ -1856,7 +1856,7 @@ class MongoModuleStore(ModuleStoreDraftAndPublished, ModuleStoreWriteBase, Mongo
# Build an update set with potentially multiple embedded fields.
updates_by_type = {}
for asset_type, assets in assets_by_type.iteritems():
updates_by_type[self._make_mongo_asset_key(asset_type)] = assets.as_list()
updates_by_type[self._make_mongo_asset_key(asset_type)] = list(assets)
# Update the document.
self.asset_collection.update(

11
common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
View File

@@ -2856,14 +2856,11 @@ class SplitMongoModuleStore(SplitBulkWriteMixin, ModuleStoreWriteBase):
course_assets = new_structure.setdefault('assets', {})
asset_type = asset_key.asset_type
all_assets = SortedAssetList(iterable=[])
# Assets should be pre-sorted, so add them efficiently without sorting.
# extend() will raise a ValueError if the passed-in list is not sorted.
all_assets.extend(course_assets.setdefault(asset_type, []))
all_assets = SortedAssetList(iterable=course_assets.setdefault(asset_type, []))
asset_idx = all_assets.find(asset_key)
all_assets_updated = update_function(all_assets, asset_idx)
new_structure['assets'][asset_type] = all_assets_updated.as_list()
new_structure['assets'][asset_type] = list(all_assets_updated)
# update index if appropriate and structures
self.update_structure(asset_key.course_key, new_structure)
@@ -2894,7 +2891,7 @@ class SplitMongoModuleStore(SplitBulkWriteMixin, ModuleStoreWriteBase):
)
for asset_type, assets in assets_by_type.iteritems():
new_structure['assets'][asset_type] = assets.as_list()
new_structure['assets'][asset_type] = list(assets)
# update index if appropriate and structures
self.update_structure(course_key, new_structure)
@@ -2935,7 +2932,7 @@ class SplitMongoModuleStore(SplitBulkWriteMixin, ModuleStoreWriteBase):
mdata.update(attr_dict)
# Generate a Mongo doc from the metadata and update the course asset info.
all_assets[asset_idx] = mdata.to_storable()
all_assets.insert_or_update(mdata)
return all_assets
self._update_course_assets(user_id, asset_key, _internal_method)

2
requirements/edx/base.in
View File

@@ -141,7 +141,7 @@ sailthru-client==2.2.3 # For Sailthru integration
Shapely==1.2.16 # Geometry library, used for image click regions in capa
six # Utilities for supporting Python 2 & 3 in the same codebase
sorl-thumbnail==12.3 # Image thumbnail management
sortedcontainers==0.9.2 # Provides SortedListWithKey, used for lists of XBlock assets
sortedcontainers # Provides SortedKeyList, used for lists of XBlock assets
sqlparse # Required by Django to run migrations.RunSQL
stevedore # Support for runtime plugins, used for XBlocks and edx-platform Django app plugins
unicodecsv # Easier support for CSV files with unicode text

2
requirements/edx/base.txt
View File

@@ -225,7 +225,7 @@ slumber==0.7.1 # via edx-rest-api-client
social-auth-app-django==2.1.0
social-auth-core==1.7.0
sorl-thumbnail==12.3
sortedcontainers==0.9.2
sortedcontainers==2.1.0
soupsieve==1.8 # via beautifulsoup4
sqlparse==0.2.4
stevedore==1.30.0

2
requirements/edx/development.txt
View File

@@ -317,7 +317,7 @@ snowballstemmer==1.2.1 # via sphinx
social-auth-app-django==2.1.0
social-auth-core==1.7.0
sorl-thumbnail==12.3
sortedcontainers==0.9.2
sortedcontainers==2.1.0
soupsieve==1.8
sphinx==1.8.4
sphinxcontrib-websupport==1.1.0 # via sphinx

2
requirements/edx/testing.txt
View File

@@ -306,7 +306,7 @@ slumber==0.7.1
social-auth-app-django==2.1.0
social-auth-core==1.7.0
sorl-thumbnail==12.3
sortedcontainers==0.9.2
sortedcontainers==2.1.0
soupsieve==1.8
splinter==0.9.0
sqlparse==0.2.4