-
Notifications
You must be signed in to change notification settings - Fork 2
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
fix 14 and 15: define upstream + pull --rebase upstream #18
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
releaser/make_release.py
Outdated
def make_release(local_repository, package_name, module_name, release_name='dev', steps=':', branch='master', | ||
src_documentation=None, tmp_dir=None): | ||
config = set_config(local_repository, package_name, module_name, release_name, branch, src_documentation, tmp_dir) | ||
def make_release(local_repository, project_name, package_name, module_name, release_name='dev', steps=':', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't forget to update the "make_release.py" script of all projects accordingly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
wait a sec.
releaser/make_release.py
Outdated
@@ -289,6 +294,10 @@ def push(config): | |||
return | |||
|
|||
chdir(config['repository']) | |||
# rebase on upstream | |||
doechocall('rebase on upstream before pushing main repository changes to GitHub', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This probably does not hurt to do it here too, but this does NOT fix #15, as this rebases/push is for the "main" repository, not the feedstock repository, which is handled at: https://github.com/larray-project/releaser/blob/master/releaser/update_feedstock.py#L51
@alixdamman what's the status of this PR? |
This would change your way of using the "releaser", so I didn't wanted to push this PR. |
Sorry, I don't remember what this was all about... In what way would it change the way we use the releaser? It's not necessarily a bad thing if the overall experience is better... |
The releaser modify your local copy of larray, larray-editor, ... |
No description provided.