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

fix 14 and 15: define upstream + pull --rebase upstream #18

Closed
wants to merge 0 commits into from

Conversation

alixdamman
Copy link
Contributor

No description provided.

@alixdamman alixdamman requested a review from gdementen March 16, 2018 15:01
Copy link
Collaborator

@gdementen gdementen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

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=':',
Copy link
Collaborator

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.

Copy link
Collaborator

@gdementen gdementen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wait a sec.

@@ -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',
Copy link
Collaborator

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

@gdementen
Copy link
Collaborator

@alixdamman what's the status of this PR?

@alixdamman
Copy link
Contributor Author

This would change your way of using the "releaser", so I didn't wanted to push this PR.
Maybe, I should closing it?

@gdementen
Copy link
Collaborator

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...

@alixdamman
Copy link
Contributor Author

The releaser modify your local copy of larray, larray-editor, ...
When I started this PR, I thought the idea of the release was to clone the github repository in a temporary directory and to do everything from it until the release is done.

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