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

Conversation

Projects
None yet
4 participants
@jcrist
Collaborator

jcrist commented Sep 17, 2018

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

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

And separated tests.

jcrist added some commits Sep 17, 2018

Fixup pickle, add copy
- Fixes pickle of `COO` to exclude the `_cache` attribute
- Adds a `COO.copy` method to mirror numpy.

@jcrist jcrist force-pushed the jcrist:copy-and-pickle branch from 7add1ff to aae26d4 Sep 18, 2018

@jcrist jcrist force-pushed the jcrist:copy-and-pickle branch from aae26d4 to 0de7ee9 Sep 18, 2018

@jcrist

This comment has been minimized.

Collaborator

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

This comment has been minimized.

Collaborator

hameerabbasi commented Sep 18, 2018

Merging, thanks.

@hameerabbasi hameerabbasi merged commit 5bb1a54 into pydata:master Sep 18, 2018

5 checks passed

LGTM analysis: Python No alert changes
Details
ci/circleci Your tests passed on CircleCI!
Details
codecov/patch 100% of diff hit (target 97.5%)
Details
codecov/project 97.51% (+0.01%) compared to 8da1a35
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@jcrist jcrist deleted the jcrist:copy-and-pickle branch Sep 18, 2018

@dhirschfeld

This comment has been minimized.

dhirschfeld commented Sep 19, 2018

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

This comment has been minimized.

Collaborator

mrocklin commented Sep 19, 2018

@hameerabbasi

This comment has been minimized.

Collaborator

hameerabbasi commented Sep 19, 2018

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