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

Merge pull request #10870 from edx/ned/new-xblock

Browse Source 
Update XBlock to 0.4.4 (just a packaging change)
This commit is contained in:
Ned Batchelder
2015-12-09 17:02:49 -05:00
parent b9bfe11ec9 02fa9c101d
commit 3603ede558
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pavelib/quality.py
View File

@@ -50,8 +50,7 @@ def find_fixme(options):
apps_list = ' '.join(top_python_dirs(system))
pythonpath_prefix = (
"PYTHONPATH={system}:{system}/lib"
"common/djangoapps:common/lib".format(
"PYTHONPATH={system}/djangoapps:common/djangoapps:common/lib".format(
system=system
)
)
@@ -105,8 +104,7 @@ def run_pylint(options):
apps_list = ' '.join(top_python_dirs(system))
pythonpath_prefix = (
"PYTHONPATH={system}:{system}/djangoapps:{system}/"
"lib:common/djangoapps:common/lib".format(
"PYTHONPATH={system}/djangoapps:common/djangoapps:common/lib".format(
system=system
)
)
@@ -446,7 +444,7 @@ def run_quality(options):
jshint_reports = u' '.join(jshint_files)
pythonpath_prefix = (
"PYTHONPATH=$PYTHONPATH:lms:lms/djangoapps:lms/lib:cms:cms/djangoapps:cms/lib:"
"PYTHONPATH=$PYTHONPATH:lms:lms/djangoapps:cms:cms/djangoapps:"
"common:common/djangoapps:common/lib"
)

2
requirements/edx/github.txt
View File

@@ -71,7 +71,7 @@ git+https://github.com/edx/rfc6266.git@v0.0.5-edx#egg=rfc6266==0.0.5-edx
git+https://github.com/edx/lettuce.git@0.2.20.002#egg=lettuce==0.2.20.002
# Our libraries:
-e git+https://github.com/edx/XBlock.git@xblock-0.4.2#egg=XBlock==0.4.2
git+https://github.com/edx/XBlock.git@xblock-0.4.4#egg=XBlock==0.4.4
-e git+https://github.com/edx/codejail.git@6b17c33a89bef0ac510926b1d7fea2748b73aadd#egg=codejail
-e git+https://github.com/edx/js-test-tool.git@v0.1.6#egg=js_test_tool
-e git+https://github.com/edx/event-tracking.git@0.2.1#egg=event-tracking==0.2.1