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

Refactored assertion error in Link component into suspicious warning #834

Merged
merged 2 commits into from
Apr 11, 2022

Conversation

henhuy
Copy link
Contributor

@henhuy henhuy commented Mar 25, 2022

This PR aims to merge PR #827, which was merged into v0.5, into dev as well.
This PR only turns errors into a warning - should be fine to merge.

@henhuy henhuy self-assigned this Mar 25, 2022
@henhuy henhuy requested review from jnnr and p-snft March 25, 2022 10:34
@henhuy
Copy link
Contributor Author

henhuy commented Mar 25, 2022

As @jnnr mentioned in chat, we want to make this PR availalbe in dev branch. Should have no conflicts.
@p-snft PR #827 holding the same code changes is already merged to v0.5 - ths I think there is no need to merge dev into v0.5 afterwards (also as structure has changed in v0.5 and link.py has been refactored/moved).

@p-snft
Copy link
Member

p-snft commented Mar 25, 2022

As @jnnr mentioned in chat, we want to make this PR availalbe in dev branch. Should have no conflicts. @p-snft PR #827 holding the same code changes is already merged to v0.5 - ths I think there is no need to merge dev into v0.5 afterwards (also as structure has changed in v0.5 and link.py has been refactored/moved).

Maybe, this would be the point in time where a v0.4 branch would be useful. At some point, the branches dev and v0.5 will have to be merged. This v0.4 branch would be the location for continued maintenance and backporting of fixes from v0.5.

@henhuy
Copy link
Contributor Author

henhuy commented Mar 25, 2022

So you suggest renaming this PR into v0.4?
Or shall I branch a v0.4 from dev and merge this PR into it?
And I just saw, that there are tags for v0.4 versions - shall I branch from latest v0.4 tag instead?

@p-snft
Copy link
Member

p-snft commented Mar 25, 2022

The clean way would be to form v0.4 from the current dev and to merge this PR into the new branch. As, however, there are no (other) changes to dev, the result is the same when you just rename fix/link_inputs to v0.4. (You will just not receive formal reviews as there is no PR.)

PS: Pleas do not branch from the tagged versions. That would just create extra work.

@henhuy henhuy changed the base branch from dev to v0.4 March 29, 2022 08:46
@henhuy henhuy merged commit 3c19ba7 into v0.4 Apr 11, 2022
@henhuy henhuy deleted the fix/link_inputs branch April 11, 2022 10:02
This pull request was closed.
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.

2 participants