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

Feature/merge master #1371

Merged
merged 67 commits into from
Dec 15, 2023
Merged

Feature/merge master #1371

merged 67 commits into from
Dec 15, 2023

Conversation

lavigne958
Copy link
Collaborator

@lavigne958 lavigne958 commented Dec 14, 2023

My attempt to merge master in release/6.0.0

I might be wrong on some of the conflicts I solved with the get, get_values merge, with the combined_merge_cells and all tests related to it.

so far I didn't have to change the tests to make it pass (except the method signature that changed for Worksheet.update().

closes #1356

beginning of fix
add this to worksheet.py
(failing)
for combine func new args
…-use-it

remove `use_index` and references to it in `get_records`
now, if a user does not specify client_factory, they will not get a warning
…depends-on-kwarg

make deprecation warning dependent on if kwarg is used for client_factory
(cherry picked from commit 67141a1)
…ducing-incorrect-result-when-used-on-a-non-default-cell-range

fix `combine_merged_cells` when using from a range that doesn't start at `A1`
alifeee and others added 17 commits December 4, 2023 21:48
change `worksheet.update` migration guide
This reverts commit 3fc6847.
This reverts commit cba30e4.
…a-large-number-of-empty-rows-after-the-end-of-the-data

1363 get all records retrieves a large number of empty rows after the end of the data
Skip CVE directly related to wrong pip version, we only use it a tool for the CI to run the package
we don't actually use it in production, we don't handle nor manage pip versions
Copy link
Collaborator

@alifeee alifeee left a comment

Choose a reason for hiding this comment

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

so far I didn't have to change the tests to make it pass

if you didn't have to change any tests then... all is good!... well... it is our fault if things went wrong for writing bad tests...!

but yes. great work with this! merges are busy things :)

merge time!

.github/workflows/main.yaml Show resolved Hide resolved
@alifeee alifeee added this to the 6.0.0 milestone Dec 15, 2023
@alifeee alifeee mentioned this pull request Dec 15, 2023
alifeee added a commit that referenced this pull request Dec 15, 2023
@lavigne958 lavigne958 merged commit da4739b into feature/release_6_0_0 Dec 15, 2023
10 checks passed
@lavigne958 lavigne958 deleted the feature/merge_master branch December 15, 2023 22:04
@alifeee alifeee linked an issue Dec 18, 2023 that may be closed by this pull request
@lavigne958 lavigne958 mentioned this pull request Dec 26, 2023
@alifeee alifeee mentioned this pull request Jan 26, 2024
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.

merge master into v6.0.0 release branch
2 participants