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

strip modules for SkyPy release #389

Merged
merged 7 commits into from
Jan 12, 2021
Merged

strip modules for SkyPy release #389

merged 7 commits into from
Jan 12, 2021

Conversation

ntessore
Copy link
Member

@ntessore ntessore commented Jan 5, 2021

This PR temporarily strips out modules that are not part of the upcoming SkyPy release.

Each module is removed in a separate commit, so this PR should not be squashed. After this PR is merge, we will create individual module/MODULE_NAME branches that revert one commit each. These branches will continue development of the modules for the next SkyPy releases.

Where necessary, we should be able to simply point currently open pull requests to the new branches once they are created. This might require an update of the PR branch but since stripping and each reversion happens sequentially, that should require minimal intervention.

@ntessore ntessore added this to the Version 0.4 milestone Jan 5, 2021
@ntessore ntessore requested a review from rrjbca January 5, 2021 18:11
@ntessore ntessore requested a review from a team as a code owner January 5, 2021 18:11
@Lucia-Fonseca
Copy link
Member

Lucia-Fonseca commented Jan 6, 2021

I have checked the documentation and all looks good there.

Q: why should this PR not be squashed after merging?
Q: Is the idea to do something similar to the second diagram here ?
Q: if this affects the future work flow, should we update the contribution guidelines?

@ntessore
Copy link
Member Author

ntessore commented Jan 6, 2021

Q: why should this PR not be squashed after merging?

In our commit history on master, we want to have the commits for each module to show up. That way, we can make individual "module branches" that each revert a single commit (and it will specifically say "reverted commit xyz" in the message). If we squash the commits when merging this PR, then there will only be a single commit with all changes, and we cannot have simple revert commits for each change.

Q: if this affects the future work flow, should we update the contribution guidelines?

Not that I can think of, no. We might want to add a description of the process for adding new modules, and the fact that they are merged into release/master once they are "complete", in a second step.

@rrjbca rrjbca marked this pull request as draft January 6, 2021 10:35
@rrjbca
Copy link
Contributor

rrjbca commented Jan 6, 2021

Marking this as a draft for now while I test it and other possible solutions locally

@ntessore
Copy link
Member Author

ntessore commented Jan 7, 2021

Module branches should be named module/MODULE_NAME to prevent issues if someone still has local refs to the previous develop branch around.

@rrjbca rrjbca marked this pull request as ready for review January 12, 2021 14:21
@rrjbca rrjbca merged commit 8793e83 into master Jan 12, 2021
@ntessore ntessore deleted the strip branch January 12, 2021 17:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants