Skip to content

update sam library files #443

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

Closed
wants to merge 7 commits into from
Closed

update sam library files #443

wants to merge 7 commits into from

Conversation

cwhanse
Copy link
Member

@cwhanse cwhanse commented Mar 29, 2018

pvlib python pull request guidelines

Thank you for your contribution to pvlib python!

You may submit a pull request with your code at any stage of completion, however, before the code can be merged the following items must be addressed:

  • [X ] Closes issue update sam library files #440
  • Fully tested. Added and/or modified tests to ensure correct behavior for all reasonable inputs. Tests must pass on the TravisCI and Appveyor testing services.
  • Code quality and style is sufficient. Passes git diff upstream/master -u -- "*.py" | flake8 --diff and/or landscape.io linting service.
  • New code is fully documented. Includes sphinx/numpydoc compliant docstrings and comments in the code where necessary.
  • Updates entries to docs/sphinx/source/api.rst for API changes.
  • Adds description and name entries in the appropriate docs/sphinx/source/whatsnew file for all changes.

Please don't hesitate to ask for help if you're unsure of how to accomplish any of the above. You may delete all of these instructions except for the list above.

Brief description of the problem and proposed solution (if not already fully described in the issue linked to above):

Updates sam library files for CEC module and CEC inverter models.

@wholmgren
Copy link
Member

wholmgren commented Mar 30, 2018

git annoyances strike again! My recommendation is to:

  1. add a new "remote" so you can get the latest version on github. This associates the name "upstream" with the url, but does nothing more: git remote add upstream https://github.com/pvlib/pvlib-python.git
  2. fetch the data from the upstream remote (this doesn't touch your data or any local changes you've made. it just stores it in a hidden directory): git fetch upstream
  3. make a new local branch that's based on upstream/master: git checkout -b samupdate upstream/master
  4. (re)apply your new commits. You can reapply commits manually or using git cherry-pick. You don't want to use git merge because that will pull the other unwanted changes in too.
  5. push your new branch to github: git push --set-upstream origin samupdate
  6. make a new pull request from the samupdate branch.

I use steps 2-6 for essentially every pull request.

Step 7 is repeat until it's muscle memory and doesn't feel like a hassle. The git flogging will continue until moral improves.

(The original comment contained commands that did not work, so I edited them)

@wholmgren
Copy link
Member

closing this pull request in favor of #444

@wholmgren wholmgren closed this Mar 30, 2018
@wholmgren wholmgren mentioned this pull request Apr 11, 2018
13 tasks
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.

2 participants