From 586dab51f5e1952df3cea2b7ae38090983a5a529 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Mon, 7 Dec 2015 16:33:44 -0500 Subject: [PATCH 1/2] Update XBlock to 0.4.4 (just a packaging change) --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index c9f19cfa49..f0a4de0051 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -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 From 02fa9c101d81a855cddf93d40940660fe79bd747 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Tue, 8 Dec 2015 15:28:58 -0500 Subject: [PATCH 2/2] Stop adding lms/lib and cms/lib to the PYTHONPATH for pylint These two directories are not added to sys.path when running the application, so there is no need to add them for pylint. When they are added, they make it impossible to run pylint properly because lms.lib.xblock is imported when trying to import xblock. --- pavelib/quality.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pavelib/quality.py b/pavelib/quality.py index b7aa130554..b293832c53 100644 --- a/pavelib/quality.py +++ b/pavelib/quality.py @@ -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" )