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

merge master into v6.0.0 release branch #1356

Closed
alifeee opened this issue Nov 29, 2023 · 10 comments · Fixed by #1371
Closed

merge master into v6.0.0 release branch #1356

alifeee opened this issue Nov 29, 2023 · 10 comments · Fixed by #1371
Assignees
Milestone

Comments

@alifeee
Copy link
Collaborator

alifeee commented Nov 29, 2023

No description provided.

@alifeee alifeee added this to the 6.0.0 milestone Nov 29, 2023
@lavigne958 lavigne958 self-assigned this Nov 29, 2023
@lavigne958
Copy link
Collaborator

I will wait for the fix for #1354 to be merged so I do this merge only once. if that's ok with you.

@lavigne958
Copy link
Collaborator

now we'll wait for #1362 🙃

@alifeee
Copy link
Collaborator Author

alifeee commented Dec 4, 2023

ah... I have just realised the "minor cleanup" changes in #1357 will have to be reverted when they are merged into 6.0.0

as they use update with swapped arguments 🙅‍♂️

image

oops!

(the tests should still work just will throw warnings)

@lavigne958
Copy link
Collaborator

yes right we need to update that back too.

I am working on merging master into feature/release_6_0_0 , I am facing some issues in the merge conflicts.
I need to resolve the changes in get and get_values and the recent changes in the get_records with the starting and ending index.

Once this is solved I should be able to merge master as ISO compatible, then we can introduce the simplification of the get_all_records method.

@lavigne958
Copy link
Collaborator

I am getting there, I noticed: we now in 6.0.0 return [[]] empty matrix in case of empty values, and not just [] empty list.

That's one case done ✔️

Question @alifeee we have a test: test_update_works_with_swapped_values_and_range
to me we don't need it anymore as we removed the warning as we changed the method signature, do you agree that we remove the test right ? 🤔

@alifeee
Copy link
Collaborator Author

alifeee commented Dec 15, 2023

I am working on merging master into feature/release_6_0_0 , I am facing some issues in the merge conflicts.
I need to resolve the changes in get and get_values and the recent changes in the get_records with the starting and ending index.

Yes, those are quite involved changes... I hope you are having fun. Hopefully the test suite helps avoid any bad feelings.

I am getting there, I noticed: we now in 6.0.0 return [[]] empty matrix in case of empty values, and not just [] empty list.

Interesting. This may break some code? Did you have to change any tests for this? What does the documentation say that we return? Anyway, this should probably go in the migration guide

Question @alifeee we have a test: test_update_works_with_swapped_values_and_range
to me we don't need it anymore as we removed the warning as we changed the method signature, do you agree that we remove the test right ? 🤔

We changed the method signature. However, I think we should keep the "swap if wrong way round", at least for a while. As discussed in #1336, it will help users migrate. And if we keep sending the warning then maybe they will change their code... It may be annoying for it to suddenly change, especially if we can so "easily" tell if a user has swapped args...

@lavigne958
Copy link
Collaborator

I am working on merging master into feature/release_6_0_0 , I am facing some issues in the merge conflicts.
I need to resolve the changes in get and get_values and the recent changes in the get_records with the starting and ending index.

Yes, those are quite involved changes... I hope you are having fun. Hopefully the test suite helps avoid any bad feelings.

Actually they do ! I based my choices and solved conflicts based on the test results.

I am getting there, I noticed: we now in 6.0.0 return [[]] empty matrix in case of empty values, and not just [] empty list.

Interesting. This may break some code? Did you have to change any tests for this? What does the documentation say that we return? Anyway, this should probably go in the migration guide

It might break the code yes, I did not but I think we don't have enough test for that special case.

I will check documentation, I don't think we mention anything on empty value range return.

Probably, I need to confirm that before we used to return an empty list and now it an empty matrix. Which is different in fact as the top list is NOT empty, it contains an empty list which make it 1 element long ! 😬

Question @alifeee we have a test: test_update_works_with_swapped_values_and_range
to me we don't need it anymore as we removed the warning as we changed the method signature, do you agree that we remove the test right ? 🤔

We changed the method signature. However, I think we should keep the "swap if wrong way round", at least for a while. As discussed in #1336, it will help users migrate. And if we keep sending the warning then maybe they will change their code... It may be annoying for it to suddenly change, especially if we can so "easily" tell if a user has swapped args...

But you mean we keep this test in release v5.X.Y ? Or in v6.X.Y ?

Agreed we can keep a test that checks if arguments have swapped or not.

Improvements coming up !

@alifeee
Copy link
Collaborator Author

alifeee commented Dec 15, 2023

But you mean we keep this test in release v5.X.Y ? Or in v6.X.Y ?

both, I think

@lavigne958
Copy link
Collaborator

in v5.x.y version it's already here, I'll add it in feature/release_6_0_0 soon

@alifeee alifeee linked a pull request Dec 18, 2023 that will close this issue
@alifeee
Copy link
Collaborator Author

alifeee commented Dec 18, 2023

closed by #1371

@alifeee alifeee closed this as completed Dec 18, 2023
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 a pull request may close this issue.

2 participants