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

Fixup pickle, add copy #184

Merged
merged 3 commits into from Sep 18, 2018
Merged

Fixup pickle, add copy #184

merged 3 commits into from Sep 18, 2018

Conversation

jcrist
Copy link
Collaborator

@jcrist jcrist commented Sep 17, 2018

  • Fixes pickle of COO to exclude the _cache attribute
  • Adds a COO.copy method to mirror numpy.

Copy link
Collaborator

@hameerabbasi hameerabbasi left a comment

Choose a reason for hiding this comment

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

This looks great! An addition to the changelog is always nice. :-)

And separated tests.

- Fixes pickle of `COO` to exclude the `_cache` attribute
- Adds a `COO.copy` method to mirror numpy.
@jcrist
Copy link
Collaborator Author

jcrist commented Sep 18, 2018

I've been avoiding adding things to the changelog until approved because every merged PR results in merge conflicts for existing PRs. Other repos solve this by:

  • Adding placeholder list elements to be edited later (git merge works better when editing a list element than adding a new line)
  • Holding off on adding changelog entries until release
  • Adding a separate tiny file in a directory for each new change, and merging these together on release
  • Inserting items in the changelog rather than prepending, minimizing chances for conflicts over time.

Unfortunately none of these work with the sphinx releases extension you're using to generate a running changelog. I'm not sure if anything should be done to change this.

@hameerabbasi
Copy link
Collaborator

Merging, thanks.

@hameerabbasi hameerabbasi merged commit 5bb1a54 into pydata:master Sep 18, 2018
@jcrist jcrist deleted the copy-and-pickle branch September 18, 2018 15:32
@dhirschfeld
Copy link

It can be very painful for contributors to have to deal with CHANGELOG merge conflicts.

I've also seen it done where an issue CHANGELOG - 0.4.2 is created and the changelog entries are accumulated there and only moved to the actual changelog file when the when the release is made.

@mrocklin
Copy link
Collaborator

mrocklin commented Sep 19, 2018 via email

@hameerabbasi
Copy link
Collaborator

That seems like a good way to go, but you lose out on "what's coming next" for the uninitiated.

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.

None yet

4 participants