need to pull master branch changes from 12/4

[yarko]

Hi - Just tried your data jam config - nice.

Buy you have one problem in your datajam branch which was fixed for config today - namely, mitxmako.shortcuts has been renamed to edxmako.shortcuts

See https://github.com/edx/edx-platform/pull/1823

[feanil]

@rocha @mulby Have you guys fixed this?

[mulby]

I'm fairly certain this is due to checking out "master" of edx-platform and trying to use it with a datajam stack. The datajam branch of edx-platform should not have the "rename mitx to edx" commit on it (I hope!).

@yarko - can you confirm that you have the "datajam" branch of edx-platform checked out?

[yarko]

I'm sorry I literally followed the instructions on the data Jim Repo I
didn't even do a check out I only ran the script
On Dec 5, 2013 11:38 AM, "Yarko Tymciurak" yarkot1@gmail.com wrote:

On the road today but I can guarantee you I made a clean check out of only
data Jam and Let the script do everything ...

I was actually busy comparing the Ed X platform start up versus the
configuration data Stack when I discovered data jam, so I had three
separate clean checkouts
On Dec 5, 2013 11:07 AM, "Gabe Mulley" notifications@github.com wrote:

I'm fairly certain this is due to checking out "master" of edx-platform
and trying to use it with a datajam stack. The datajam branch of
edx-platform should not have the "rename mitx to edx" commit on it (I
hope!).

@yarko https://github.com/yarko - can you confirm that you have the
"datajam" branch of edx-platform checked out?

—
Reply to this email directly or view it on GitHubhttps://github.com//issues/4#issuecomment-29916273
.

[yarko]

One more thing if you were following the configuration repo's pattern then
checking out master is what it does
On Dec 5, 2013 11:38 AM, "Yarko Tymciurak" yarkot1@gmail.com wrote:

On the road today but I can guarantee you I made a clean check out of only
data Jam and Let the script do everything ...

I was actually busy comparing the Ed X platform start up versus the
configuration data Stack when I discovered data jam, so I had three
separate clean checkouts
On Dec 5, 2013 11:07 AM, "Gabe Mulley" notifications@github.com wrote:

I'm fairly certain this is due to checking out "master" of edx-platform
and trying to use it with a datajam stack. The datajam branch of
edx-platform should not have the "rename mitx to edx" commit on it (I
hope!).

@yarko https://github.com/yarko - can you confirm that you have the
"datajam" branch of edx-platform checked out?

—
Reply to this email directly or view it on GitHubhttps://github.com//issues/4#issuecomment-29916273
.

[mulby]

It should be checking out the datajam branch of edx-platform. Did you happen to already have a copy of the configuration or edx-platform repos in the directory that you ran the 'edx-datajam' script from? It won't touch them if you do, which could cause the issue you are seeing.

[yarko]

No, this was a completely fresh directory, eventually 4 ssh logins by your
script, each bringing up a server instance (I was impressed). It was the
lms instance which showed the error traceback, but everything kept running
w/ existing css, etc. It really was pretty pleasing!
On Dec 5, 2013 11:43 AM, "Gabe Mulley" notifications@github.com wrote:

It should be checking out the datajam branch of edx-platform. Did you
happen to already have a copy of the configuration or edx-platform repos in
the directory that you ran the 'edx-datajam' script from? It won't touch
them if you do, which could cause the issue you are seeing.

—
Reply to this email directly or view it on GitHubhttps://github.com//issues/4#issuecomment-29919686
.

[mulby]

Oh, interesting, so it still worked, it just output some error messages?

[yarko]

Btw, it did checkout the datajam branch - that's why I sent you the pull
reference, since this was (as of yesterday afternoon) fixed in Master. If
it would have checked out master, this would not have been a problem at
that particular time...
On Dec 5, 2013 11:43 AM, "Gabe Mulley" notifications@github.com wrote:

It should be checking out the datajam branch of edx-platform. Did you
happen to already have a copy of the configuration or edx-platform repos in
the directory that you ran the 'edx-datajam' script from? It won't touch
them if you do, which could cause the issue you are seeing.

—
Reply to this email directly or view it on GitHubhttps://github.com//issues/4#issuecomment-29919686
.

[yarko]

Correct - traceback from sass watcher in terminal
On Dec 5, 2013 12:16 PM, "Gabe Mulley" notifications@github.com wrote:

Oh, interesting, so it still worked, it just output some error messages?

—
Reply to this email directly or view it on GitHubhttps://github.com//issues/4#issuecomment-29922608
.

[mulby]

Got it, I misunderstood. Right now we're tackling "show stopper" type issues, but we will certainly address this if we can get to it before next week.

[yarko]

+1
On Dec 5, 2013 12:32 PM, "Gabe Mulley" notifications@github.com wrote:

Got it, I misunderstood. Right now we're tackling "show stopper" type
issues, but we will certainly address this if we can get to it before next
week.

—
Reply to this email directly or view it on GitHubhttps://github.com//issues/4#issuecomment-29923934
.