Skip to content

removed CMAttribute and very old text file#2806

Merged
DPeterK merged 5 commits into
SciTools:masterfrom
corinnebosley:dep_cmatts
Oct 18, 2017
Merged

removed CMAttribute and very old text file#2806
DPeterK merged 5 commits into
SciTools:masterfrom
corinnebosley:dep_cmatts

Conversation

@corinnebosley

Copy link
Copy Markdown
Member

This mosig codes text file used to be used for loading, but has not been used since 2013, just got left lying around dying slowly and painfully.

I'm putting it out of its misery. It's the kindest thing to do.

Also:
Closes #2670

@DPeterK DPeterK left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@corinnebosley looks good 👍

@DPeterK

DPeterK commented Oct 17, 2017

Copy link
Copy Markdown
Member

@corinnebosley you haven't removed the unused imports from rules.py ⚠️ Could you do so and then we can get this merged.

@corinnebosley

Copy link
Copy Markdown
Member Author

@dkillick So it turns out I pushed up the change you requested to the wrong branch, so I'll just make the same change to this one instead.

I apparently also have to rebase...

@corinnebosley

Copy link
Copy Markdown
Member Author

@dkillick No I don't. No rebasing necessary. I wonder where I saw that conflict message then...

@corinnebosley

Copy link
Copy Markdown
Member Author

@dkillick I had messed up a couple of things in the confusing rebase, so I have tried to correct them now. I hope there's no other mistakes that I (and most of the tests, worryingly) have missed...

@corinnebosley

Copy link
Copy Markdown
Member Author

Please GitHub, please please find my commit and tell Travis to run the tests on it...

@pelson pelson self-requested a review October 18, 2017 08:20

@pelson pelson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@DPeterK DPeterK merged commit 8c6bb4d into SciTools:master Oct 18, 2017
@corinnebosley corinnebosley self-assigned this Oct 18, 2017
@QuLogic QuLogic added this to the v2.0.0 milestone Oct 18, 2017
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.

4 participants