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.

Sign up for GitHub

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

Jump to bottom

Smart repr and str for Groups #1225

Merged
merged 5 commits into from
Mar 2, 2017
Merged

Smart repr and str for Groups #1225

merged 5 commits into from
Mar 2, 2017

Conversation

jeiros
Copy link
Contributor

@jeiros jeiros commented Mar 1, 2017 •
edited

Fixes #1223

Changes made in this Pull Request:

  • Added a smart __str__ method in GroupBase

PR Checklist

  • Tests?
  • Docs?
  • CHANGELOG updated?
  • Issue raised/referenced?

@orbeckst
Copy link
Member

orbeckst commented Mar 1, 2017

I squash-merged #1222 – please rebase your PR against develop.

@jeiros
Copy link
Contributor Author

jeiros commented Mar 1, 2017

Ok, rebased it. Not too sure if the commits are showing twice now because I had started working on another branch, which I then renamed to issue-1223-smart-reps to be inline with the PR.

@richardjgowers
Copy link
Member

Hmm ok, I think what's happened here is you branched from the PR branch, and then that got squashed so the commits are different. You could probably rebase a lot to fix this, or just branch of the latest version of develop then copy in the changes you've made here (what I'd do).

Apart from that, there's a repr(sg) test that I think got missed, but otherwise good

@jeiros
Copy link
Contributor Author

jeiros commented Mar 2, 2017

Hi @richardjgowers
If I branch out of dev and copy there the changes, I will need to open a new PR to merge it back into dev, won't I? I'll take a look at the test that's failing.

@richardjgowers
Copy link
Member

@jeiros you could do git push -f (usually evil, good here) to overwrite this branch in your repo, then this PR will lose memory of this weird branch and will only know the new fresh branch

@jeiros
Add __str__ method to GroupBase class
6f5f6c6 
Smart reporting of groups with more than 10 items
@jeiros
Remove individual __repr__ method of groups
45ce66b 
General case is defined already in BaseGroup class
@jeiros
Added tests for groups
7a8c5e6 
Short and long tests for __str__
Tests for __repr__
@jeiros
Add myself on AUTHORS
566b28a
@jeiros
Summarize PR MDAnalysis#1225 in changelog
e2f399f
@jeiros
Copy link
Contributor Author

jeiros commented Mar 2, 2017

Hi @richardjgowers
Travis is failing on the full setup, but I don't think it's related to the changes introduced in my PR. It looks like it's hit the time limit and has been closed

@richardjgowers richardjgowers self-assigned this Mar 2, 2017
@richardjgowers richardjgowers added this to the 0.16.0 milestone Mar 2, 2017
@richardjgowers richardjgowers merged commit 80946b1 into MDAnalysis:develop Mar 2, 2017
@jeiros jeiros deleted the issue-1223-smart-reps branch March 2, 2017 15:22
orbeckst added a commit that referenced this pull request Dec 21, 2023
@IAlibay @fiona-naughton @orbeckst
Fix changelog authors (#4372)
809ade8 
Update of AUTHORS and CHANGELOG with inferred author contributions.

*  Removed duplicate mattwthompson in 0.20.0 changelog entry.: mattwthompson was placed twice by accident, this removes this duplication.

* Addition of missing authors.

   An retrospective analysis of the authors found via `git shortlog -s -n --email --branches="develop"` found several commits by authors which were not present in the `AUTHORS.md` file.

    - Zhenbo Li: commited via PR: Started tests for gnm. #803 and Make Travis run tests on OSX. #771,
    - Jenna M. Swarthout via PR Update CoC according to suggestions from current CoC committee #4289 and Point to new reporting form link (owned by conduct@mdanalysis.org) #4298,
    - Bradley Dice via PR   Fix GSD Windows compatibility #2384 ,
    - David Minh via PR #2668

   There seemed to be no indications in the above mentioned PRs that the author did not want to be in the authors file, it looks like it was just forgotten.

* Addition of missing entries from the changelog

   Continued cross referencing of the git shortlog output but also accounting for the changelog identified several individuals that had not been included in the changelog entries for the release they contributed under. They were added to the relevant entry of the changelog based on the merge commit date.

   Please note that for Tone Bengsten, we a) had no github handle (so they were assigned @tbengtsen), and b) no specific commit. Given we know that this individual was including alongside the encore merge, they were assigned to the 0.16.0 release.

* Update CHANGELOG
* PR #1218
* PR #1284 and #1408
* PR #4109
* based on git history
* PRs #803 and #771 (author addition, changelog addition)
* PR #2255 and #2221
* PR #1225
* PR #4289 and #4298
* PR #4031
* PR #4085
* PR #3635
* PR #2356
* PR #2559
* No GH handle - Encore author addition @tbengtsen
* PR #4184
* PR #2614
* PR #2219
* PR #2384
* PR #2668
* Add missing entry for Jenna

Thanks to @fiona-naughton for helping out with digging into this data :)

Co-authored-by: Fiona Naughton <fiona@mdanalysis.org>
Co-authored-by: Oliver Beckstein <orbeckst@mdanalysis.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richardjgowers richardjgowers richardjgowers approved these changes

Assignees

@richardjgowers richardjgowers

Labels
None yet
Projects
None yet
Milestone
0.16.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jeiros @orbeckst @richardjgowers