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

343 pjg simple demos #376

Merged
merged 8 commits into from
Jul 19, 2016
Merged

343 pjg simple demos #376

merged 8 commits into from
Jul 19, 2016

Conversation

gleckler1
Copy link
Contributor

@doutriaux1 @durack1 Changes to setup.py have been made as discussed, but likely need work. Demo data is currently not built into package but rather available at http:https://oceanonly.llnl.gov/gleckler1/pmp-demo-data/pmpv1.1_demodata.tar as indicated in demo1 parameter file:
https://github.com/PCMDI/pcmdi_metrics/blob/343_pjg_simple_demos/demo/parameter_files/pmp_input_parameters_demo1.py

PLS address ASAP so that we can iterate as needed and because there is more "demo" coming.

FYI documentation progressing: https://github.com/PCMDI/pcmdi_metrics/wiki/Using-the-package

@durack1
Copy link
Collaborator

durack1 commented Jul 12, 2016

@doutriaux1 there are still errors in travis, so will leave this for you to resolve..

@durack1
Copy link
Collaborator

durack1 commented Jul 12, 2016

@doutriaux1 this is still causing segfaults:
here and here
/Users/travis/build.sh: line 45: 1761 Segmentation fault: 11 python test/test_suite.py

@gleckler1
Copy link
Contributor Author

@doutriaux1 @durack1 Really need to get this fixed/pushed asap.... 2 users struggling with demo right now and need this.

@durack1
Copy link
Collaborator

durack1 commented Jul 16, 2016

@gleckler1 this is still going to fail the tests until the fixes in #378 are merged into master and these changes are pulled into this branch.. If it's holding you up, merge this, however it's going to cause conflicts with the setup.py edits in #378

@gleckler1
Copy link
Contributor Author

@durack1 @doutriaux1 Agreed, best would be get it all in, but first the bug in #378 (failing with needs to be fixed, and also verify that PG has not messed setup with this (PR343)

@durack1
Copy link
Collaborator

durack1 commented Jul 16, 2016

@gleckler1 if you feel like a pro, you could merge #378 into this branch and push again.. Then we'd know and could merge without hesitation..

@gleckler1
Copy link
Contributor Author

@durack1 not a pro

@durack1
Copy link
Collaborator

durack1 commented Jul 16, 2016

@gleckler1 wanna be a pro?

git fetch --all -p ; # Will pull all remote history across to your repo, without changing anything
git merge --no-commit origin/issue_316_regions ; # A dry run to see what will change

and if you like what you see

git merge --no-ff origin/issue_316_regions ; # Make the changes

I think.. You'll likely also have to fix the setup.py conflicts..

@gleckler1
Copy link
Contributor Author

@durack1 don't want to be a pro... I'm juggling too many fires to do this well... what I'm looking for is help

@durack1 durack1 mentioned this pull request Jul 16, 2016
@durack1
Copy link
Collaborator

durack1 commented Jul 16, 2016

@gleckler1 I tried with #379 but I am now out-pro'd, so will have to wait for @doutriaux1 to take a peek

@gleckler1 gleckler1 mentioned this pull request Jul 18, 2016
@gleckler1 gleckler1 closed this Jul 18, 2016
@doutriaux1
Copy link
Contributor

hum @gleckler1 did you really mean to close this?

@doutriaux1 doutriaux1 reopened this Jul 19, 2016
@doutriaux1 doutriaux1 closed this Jul 19, 2016
@doutriaux1 doutriaux1 reopened this Jul 19, 2016
@gleckler1
Copy link
Contributor Author

@doutriaux1 yes its nearly the same as
#376...
checking out til 9am

@gleckler1
Copy link
Contributor Author

@doutriaux1 scratch that, have kept this open and instead closed
#373
PLEASE REVIEW AND MODIFY AS NECESSARY. NEED FEEDBACK ON proposed setup changes before preparation of demos can be continued

@gleckler1 gleckler1 merged commit 6311aaf into master Jul 19, 2016
@doutriaux1
Copy link
Contributor

@gleckler1 why did you merge?

@gleckler1
Copy link
Contributor Author

@doutriaux1 Because I've been pleading for this to be the top priority since it was opened and kept asking for it to be looked at and nothing was happening. As noted the priority was to help me advance the other demo stuff coming down z pipe ...

@doutriaux1
Copy link
Contributor

yes but there are things to tweak. I reverted it and will resubmit the PR soon. Look at my comments please

@doutriaux1
Copy link
Contributor

why did you need it into master? If you need this for something else, simply merge this branch into whatever branch needs it.

@gleckler1
Copy link
Contributor Author

I wanted to get your confirmation on how the demo files were going to get mapped by setup.py (and into conda build) so that I could advance other demos based on their location.

From: Charles Doutriaux <[email protected]mailto:[email protected]>
Reply-To: PCMDI/pcmdi_metrics <[email protected]mailto:[email protected]>
Date: Tuesday, July 19, 2016 at 1:49 PM
To: PCMDI/pcmdi_metrics <[email protected]mailto:[email protected]>
Cc: gleckler1 <[email protected]mailto:[email protected]>, Mention <[email protected]mailto:[email protected]>
Subject: Re: [PCMDI/pcmdi_metrics] 343 pjg simple demos (#376)

why did you need it into master? If you need this for something else, simply merge this branch into whatever branch needs it.


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHubhttps://github.com//pull/376#issuecomment-233761112, or mute the threadhttps://github.com/notifications/unsubscribe-auth/AEV6rWNyuN-cBa8k18LNPFQOS-9CcBOdks5qXThfgaJpZM4JKney.

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

3 participants