Merge pull request #69 from MITx/update_dependencies

Update requirement dependencies
2012-05-30 12:56:33 -07:00
parent 45715e9280 e46426b196
commit b3f0281130
4 changed files with 6 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,5 @@ coverage.xml
 cover/
 log/
 reports/
-\#*\#
+/src/
+\#*\#
--- a/2
+++ b/2
@@ -1,5 +1,5 @@
 source :rubygems

-gem 'rake', '0.8.3'
+gem 'rake'
 gem 'sass', '3.1.15'
 gem 'bourbon', '~> 1.3.6'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
  specs:
    bourbon (1.3.6)
      sass (>= 3.1)
-    rake (0.8.3)
+    rake (0.9.2.2)
    sass (3.1.15)

 PLATFORMS
@@ -11,5 +11,5 @@ PLATFORMS

 DEPENDENCIES
  bourbon (~> 1.3.6)
-  rake (= 0.8.3)
+  rake
  sass (= 3.1.15)
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ python-memcached
 django-celery
 path.py
 django_debug_toolbar
-django-pipeline
+-e git://github.com/MITx/django-pipeline.git@incremental_compile#egg=django-pipeline
 django-staticfiles>=1.2.1
 django-masquerade
 fs