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

add keepat! #770

Merged
merged 4 commits into from
May 23, 2022
Merged

add keepat! #770

merged 4 commits into from
May 23, 2022

Conversation

bkamins
Copy link
Member

@bkamins bkamins commented May 13, 2022

Fixes #750

@bkamins bkamins mentioned this pull request May 13, 2022
@codecov
Copy link

codecov bot commented May 13, 2022

Codecov Report

Merging #770 (264c6e1) into master (4e631e6) will increase coverage by 0.72%.
The diff coverage is 92.85%.

@@            Coverage Diff             @@
##           master     #770      +/-   ##
==========================================
+ Coverage   88.35%   89.08%   +0.72%     
==========================================
  Files           2        2              
  Lines         146      174      +28     
==========================================
+ Hits          129      155      +26     
- Misses         17       19       +2     
Impacted Files Coverage Δ
src/Compat.jl 89.54% <92.85%> (+0.74%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4e631e6...264c6e1. Read the comment docs.

Copy link
Member

@martinholters martinholters left a comment

Choose a reason for hiding this comment

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

LGTM (modulo adding the requested comment), but needs a rebase.

@bkamins
Copy link
Member Author

bkamins commented May 16, 2022

but needs a rebase.

@martinholters - let us discuss how to handle the following issue.

DataFrames.jl has support back to Julia 1.0. Therefore we need this PR both in 4.0 and 3.x branches of Compat.jl. How would you like me to handle this? Thank you!

@bkamins
Copy link
Member Author

bkamins commented May 16, 2022

I have rebased the PR. Following the discussion in #767 after this PR is merged it should be backported to 3.x branch and both 3.x. and 4.x. releases should be done. Thank you!

README.md Outdated Show resolved Hide resolved
Co-authored-by: Martin Holters <martin.holters@hsu-hh.de>
@@ -1,6 +1,6 @@
name = "Compat"
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
version = "4.0.0"
version = "4.1.0"
Copy link
Member

Choose a reason for hiding this comment

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

Given that 4.0.0 has been yanked, should this be 4.0.1? @KristofferC?

@martinholters
Copy link
Member

Are we ok with merging and tagging this as 4.1.0? @KristofferC?

@martinholters martinholters merged commit cad1700 into JuliaLang:master May 23, 2022
@bkamins bkamins deleted the bk/keepat! branch May 23, 2022 06:35
@bkamins
Copy link
Member Author

bkamins commented May 23, 2022

Thank you!

How do we go about now to making a backport of this PR to 3.x branch and making a release?

@martinholters
Copy link
Member

You create a branch off of release-3, backport this change (git cherry-pick -x cad170038b8c63ba8c4b37c7cba62455bba4c368), amend the version in Project.toml and README.md to 3.44, open a PR against againt release-3. Once that is merged, we tag as usual.

bkamins added a commit to bkamins/Compat.jl that referenced this pull request May 23, 2022
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.

Compat for keepat!
2 participants