Skip to content

fix np dev failure#7984

Merged
nden merged 4 commits into
astropy:masterfrom
nden:np-dev-failure
Oct 26, 2018
Merged

fix np dev failure#7984
nden merged 4 commits into
astropy:masterfrom
nden:np-dev-failure

Conversation

@nden

@nden nden commented Oct 26, 2018

Copy link
Copy Markdown
Contributor

Resolves #7678

@astropy-bot

astropy-bot Bot commented Oct 26, 2018

Copy link
Copy Markdown

Hi there @nden 👋 - thanks for the pull request! I'm just a friendly 🤖 that checks for issues related to the changelog and making sure that this pull request is milestoned and labeled correctly. This is mainly intended for the maintainers, so if you are not a maintainer you can ignore this, and a maintainer will let you know if any action is required on your part 😃.

Everything looks good from my point of view! 👍

If there are any issues with this message, please report them here.

@nden nden added this to the v3.1 milestone Oct 26, 2018
@nden nden assigned pllim and unassigned pllim Oct 26, 2018
@nden nden requested a review from pllim October 26, 2018 18:40

@pllim pllim 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.

As long as tests pass, LGTM. Note to self: Need to look carefully at numpy dev build.

Comment thread CHANGES.rst Outdated
- Add a ``separability_matrix`` function which returns the correlation matrix
of inputs and outputs. [#7803]

- Fixed a bug in ``JointFitter``. [#7984]

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.

A little vague - what about:

Suggested change
- Fixed a bug in ``JointFitter``. [#7984]
- Fixed compatibility of ``JointFitter`` with the latest version of Numpy. [#7984]

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Too bad I looked at this after I looked at my email and pushed a change. I can't try the suggested change now.

@pllim

pllim commented Oct 26, 2018

Copy link
Copy Markdown
Member

CircleCI failure is unrelated.

@pllim

pllim commented Oct 26, 2018

Copy link
Copy Markdown
Member

numpy-dev build is clean!!!

=========== 11729 passed, 103 skipped, 105 xfailed in 350.20 seconds ===========

@nden

nden commented Oct 26, 2018

Copy link
Copy Markdown
Contributor Author

I'm going to push one more doc change here with "skip ci", so don't merge just yet.

@nden nden merged commit 38130bb into astropy:master Oct 26, 2018
@nden nden deleted the np-dev-failure branch December 27, 2018 19:22
bsipocz pushed a commit that referenced this pull request Feb 20, 2019
@bsipocz bsipocz modified the milestones: v3.1, v2.0.12 Feb 20, 2019
@bsipocz

bsipocz commented Feb 20, 2019

Copy link
Copy Markdown
Member

I needed to backport this to LTS to fix the circleCI failures.

Note to self: I'm afraid we'll have to have two changelog entries. If the release script will complain it needs to be added to the exceptions.

bsipocz pushed a commit that referenced this pull request Feb 20, 2019
bsipocz pushed a commit to bsipocz/astropy that referenced this pull request Feb 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants