From c485e441a9ca7ba813278450474958b65a595ce0 Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Thu, 13 Dec 2012 14:26:12 -0500 Subject: [PATCH 1/2] Do not copy already compiled coffee to js files from xmodule video and also do not save them in git --- common/lib/xmodule/xmodule/js/spec/.gitignore | 2 ++ common/lib/xmodule/xmodule/js/src/.gitignore | 2 ++ common/lib/xmodule/xmodule/video_module.py | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 common/lib/xmodule/xmodule/js/spec/.gitignore create mode 100644 common/lib/xmodule/xmodule/js/src/.gitignore diff --git a/common/lib/xmodule/xmodule/js/spec/.gitignore b/common/lib/xmodule/xmodule/js/spec/.gitignore new file mode 100644 index 0000000000..03534687ca --- /dev/null +++ b/common/lib/xmodule/xmodule/js/spec/.gitignore @@ -0,0 +1,2 @@ +*.js + diff --git a/common/lib/xmodule/xmodule/js/src/.gitignore b/common/lib/xmodule/xmodule/js/src/.gitignore new file mode 100644 index 0000000000..03534687ca --- /dev/null +++ b/common/lib/xmodule/xmodule/js/src/.gitignore @@ -0,0 +1,2 @@ +*.js + diff --git a/common/lib/xmodule/xmodule/video_module.py b/common/lib/xmodule/xmodule/video_module.py index 0593b7f00e..8a9e0aadd7 100644 --- a/common/lib/xmodule/xmodule/video_module.py +++ b/common/lib/xmodule/xmodule/video_module.py @@ -22,7 +22,8 @@ class VideoModule(XModule): resource_string(__name__, 'js/src/video/display.coffee')] + [resource_string(__name__, 'js/src/video/display/' + filename) for filename - in sorted(resource_listdir(__name__, 'js/src/video/display'))]} + in sorted(resource_listdir(__name__, 'js/src/video/display')) + if filename.endswith('.coffee')]} css = {'scss': [resource_string(__name__, 'css/video/display.scss')]} js_module_name = "Video" From 02b0f011a5020e7ae8bfa74852ac120516b42740 Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Mon, 17 Dec 2012 12:58:34 -0500 Subject: [PATCH 2/2] pin requests to a known version, as we believe there's been an upgrade which is incompatible to our usage --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index be16509cab..2ec59ed2a4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ fs beautifulsoup beautifulsoup4 feedparser -requests +requests==0.14.2 http://sympy.googlecode.com/files/sympy-0.7.1.tar.gz newrelic glob2