Skip to content

FIX: update num2julian and julian2num#18021

Merged
QuLogic merged 1 commit intomatplotlib:masterfrom
jklymak:fix-update-num2julian
Jul 24, 2020
Merged

FIX: update num2julian and julian2num#18021
QuLogic merged 1 commit intomatplotlib:masterfrom
jklymak:fix-update-num2julian

Conversation

@jklymak
Copy link
Copy Markdown
Member

@jklymak jklymak commented Jul 22, 2020

PR Summary

I guess if epoch2num should be follow matplotlib epoch, then julian2num should as well...

Follow up to #17983

PR Checklist

  • Has Pytest style unit tests
  • Code is Flake 8 compliant
  • New features are documented, with examples if plot related
  • Documentation is sphinx and numpydoc compliant
  • Added an entry to doc/users/next_whats_new/ if major new feature (follow instructions in README.rst there)
  • Documented in doc/api/next_api_changes/* if API changed in a backward-incompatible way

@jklymak jklymak added this to the v3.3.1 milestone Jul 22, 2020
@jklymak jklymak force-pushed the fix-update-num2julian branch 6 times, most recently from 9611ec8 to cec46b5 Compare July 22, 2020 23:19
@jklymak
Copy link
Copy Markdown
Member Author

jklymak commented Jul 23, 2020

Here is the render of the deprecation notice: https://41969-1385122-gh.circle-artifacts.com/0/doc/build/html/api/next_api_changes/deprecations/17983-JMK.html#functions-epoch2num-and-julian2num-use-rcparams-date-epoch-default-1970-01-01t00-00-00

Note that julian2num doesn't actually appear in our docs, but its in dates.py.

Comment thread setup.cfg.template Outdated
Comment thread lib/matplotlib/dates.py Outdated
Comment thread lib/matplotlib/dates.py Outdated
@jklymak jklymak force-pushed the fix-update-num2julian branch 3 times, most recently from aa871f8 to 97d1685 Compare July 23, 2020 21:16
Copy link
Copy Markdown
Member

@QuLogic QuLogic left a comment

Choose a reason for hiding this comment

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

Mostly minor stuff.

Comment thread doc/api/next_api_changes/deprecations/17983-JMK.rst Outdated
Comment thread lib/matplotlib/dates.py Outdated
Copy link
Copy Markdown
Member

@timhoffm timhoffm left a comment

Choose a reason for hiding this comment

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

Conditional on doc build fix.

Apply suggestions from code review

Co-authored-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
@jklymak jklymak force-pushed the fix-update-num2julian branch from 9c20006 to 4757d98 Compare July 24, 2020 14:20
@QuLogic QuLogic merged commit 4b179b9 into matplotlib:master Jul 24, 2020
@lumberbot-app
Copy link
Copy Markdown

lumberbot-app Bot commented Jul 24, 2020

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout v3.3.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 4b179b92c0fa100a2ebea3a80aadf4fc59b8d14d
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #18021: FIX: update num2julian and julian2num'
  1. Push to a named branch :
git push YOURFORK v3.3.x:auto-backport-of-pr-18021-on-v3.3.x
  1. Create a PR against branch v3.3.x, I would have named this PR:

"Backport PR #18021 on branch v3.3.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

jklymak pushed a commit to jklymak/matplotlib that referenced this pull request Jul 24, 2020
@jklymak jklymak deleted the fix-update-num2julian branch July 24, 2020 21:34
QuLogic added a commit that referenced this pull request Jul 24, 2020
…3.3.x

Backport PR #18021: FIX: update num2julian and julian2num
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.

3 participants