Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue70 durack1 create obs sftlf masks and scripts #124

Conversation

durack1
Copy link
Collaborator

@durack1 durack1 commented Oct 21, 2014

@doutriaux1 please review and merge

@doutriaux1
Copy link
Contributor

are you fixing 2 issues in one pass? Did you start this off another branch?
anyhow same comment as for other branch, need to edit setup.py and possibly test_portrait.py

@doutriaux1
Copy link
Contributor

also are we really checking in some sftlf binary files? They should go into the obs tarball.

@durack1
Copy link
Collaborator Author

durack1 commented Oct 21, 2014

@doutriaux1 speak to @gleckler1 about this.. I gave up..

@durack1
Copy link
Collaborator Author

durack1 commented Oct 21, 2014

@doutriaux1 #70 is dependent on #122 they are two separate branches (and pull requests) - the sftlf files #70 are dropped into the new directory structure #122

@doutriaux1
Copy link
Contributor

but I do see the changes from #122 in here no?

…70_durack1_create_obs_sftlf_masks_and_scripts
@durack1
Copy link
Collaborator Author

durack1 commented Oct 21, 2014

@doutriaux1 #122 has been merged back into this branch, which now solves the issue..

@durack1
Copy link
Collaborator Author

durack1 commented Oct 22, 2014

@doutriaux1 it looks to me like those CMIP5 json files have actually gone missing in this merge request.. Weird, as I appear to have them on my branch..

@doutriaux1
Copy link
Contributor

I bet you dit a "mv" instead of "git mv" if you just do "mv" then you need to manually "git add" the moved files.

@durack1
Copy link
Collaborator Author

durack1 commented Oct 22, 2014

@doutriaux1 ok that looks better, ready for merging once you fiddle paths for script files..

@durack1
Copy link
Collaborator Author

durack1 commented Oct 22, 2014

@doutriaux1 will start again to prevent the binary files from finding their way into the repo

@durack1 durack1 closed this Oct 22, 2014
@durack1 durack1 deleted the issue70_durack1_create_obs_sftlf_masks_and_scripts branch October 22, 2014 22:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants