From 919f8cf261de85b14c21917fbb0c853e562dea7b Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Thu, 28 Jun 2012 11:28:42 -0400 Subject: [PATCH 1/2] Import x_module using the full path --- cms/envs/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/envs/common.py b/cms/envs/common.py index fc721ca820..ddaeaa66b3 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -157,7 +157,7 @@ PIPELINE_CSS = { PIPELINE_ALWAYS_RECOMPILE = ['sass/base-style.scss'] -from x_module import XModuleDescriptor +from xmodule.x_module import XModuleDescriptor js_file_dir = PROJECT_ROOT / "static" / "coffee" / "module" try: os.makedirs(js_file_dir) From 19044abed293a29351e7a1928b4d4f8354fcd880 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Thu, 28 Jun 2012 11:29:46 -0400 Subject: [PATCH 2/2] Run tests before running code quality checks (for faster turnaround time) --- rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rakefile b/rakefile index b6fbb18ac6..e76e200777 100644 --- a/rakefile +++ b/rakefile @@ -39,7 +39,7 @@ def django_admin(system, env, command, *args) return "#{django_admin} #{command} --settings=#{system}.envs.#{env} --pythonpath=. #{args.join(' ')}" end -task :default => [:pep8, :pylint, :test] +task :default => [:test, :pep8, :pylint] directory REPORT_DIR directory LMS_REPORT_DIR