Skip to content
This repository was archived by the owner on Nov 11, 2024. It is now read-only.

Conversation

@bsipocz
Copy link
Member

@bsipocz bsipocz commented Feb 2, 2016

This PR adds python version dependent local sphinx inventories, so sphinx builds can pass without warnings with both python2 and python3. This supersedes #214.

Edit: (Changes to setup_helpers.py are pure PEP8 changes, and can be removed if preferred). it was moved to #226

@mhvk
Copy link

mhvk commented Feb 28, 2016

@bsipocz - long delay, but now had a look: these changes certainly seem fine, and as it would be good to get python3 builds working properly, I'm all in favour. I'm not really set up well to test them, though...

@bsipocz
Copy link
Member Author

bsipocz commented Feb 28, 2016

@mhvk - I'm not sure about the best way for the test, there isn't much docs here to do it within the helpers. Maybe the simplest is to update the helpers within astropy/astropy#4481 once this is merged and iron out any problems that come up before it goes into a release.

@bsipocz
Copy link
Member Author

bsipocz commented Feb 28, 2016

Also should this have a changelog entry? If yes, which milestone?

@mhvk
Copy link

mhvk commented Feb 29, 2016

@bsipocz - yes, sounds good to merge and test in astropy. Would this be for astropy/astropy#4556? As said, it looks good to me, but feel sufficiently unsure that I'd rather have @astrofrog or @eteq have a look.

@eteq
Copy link
Member

eteq commented Mar 4, 2016

@bsipocz - definitely changelog it. Re: milestone I think this (and the corresponding sphinx builds) should go in 1.2 - generally we've considered "doc changes" to be ok for bugfix branches, but I think this is signficant enough that it's better done in a new major release.

@bsipocz
Copy link
Member Author

bsipocz commented Mar 4, 2016

@eteq - OK. I agree that this is more than a docs change, but maybe we want to provide py3 docs build support for the affiliates before 1.2?

@bsipocz bsipocz force-pushed the sphinx_version_dependent_local_inv branch from ae1ebc1 to a784c71 Compare March 5, 2016 19:58
@bsipocz
Copy link
Member Author

bsipocz commented Mar 5, 2016

Changelog added.

@eteq
Copy link
Member

eteq commented Mar 6, 2016

Hmm, this is an interesting question that perhaps @astrofrog or @embray want to weigh on on: do we want to consider doing a helper 1.2 release before the core package? We can always do 1.2.1 (or later) before the core package 1.2 release...

@eteq eteq added this to the v1.2 milestone Mar 9, 2016
@bsipocz bsipocz force-pushed the sphinx_version_dependent_local_inv branch from a784c71 to 45833ba Compare April 20, 2016 17:03
@bsipocz
Copy link
Member Author

bsipocz commented Apr 20, 2016

@eteq - Rebased, but left the changelog in 1.2. I can move it you decide to include this in 1.1.3 :)

@eteq
Copy link
Member

eteq commented Apr 20, 2016

@bsipocz - as per discussion on gitter, looks like this is suitable for 1.1.3, so you can move it to that part of the changelog and then we'll merge.

@eteq
Copy link
Member

eteq commented Apr 20, 2016

(I'm pretty sure the one travis failure is a red herring, and the appveyor issue is the continuing "Chocolatey" business that seems to be some network issue?)

@bsipocz
Copy link
Member Author

bsipocz commented Apr 20, 2016

@eteq - Done.

@eteq eteq modified the milestones: v1.1.3, v1.2 Apr 21, 2016
@eteq
Copy link
Member

eteq commented Apr 21, 2016

Alright, great. Merging!

@eteq eteq merged commit 040a4a8 into astropy:master Apr 21, 2016
bsipocz added a commit to bsipocz/astropy that referenced this pull request May 12, 2016
@astrofrog astrofrog modified the milestones: v1.0.7, v1.1.3, v1.2 Jun 2, 2016
astrofrog pushed a commit to astropy/sphinx-astropy that referenced this pull request Jan 29, 2018
…rsion_dependent_local_inv

Python version dependent local sphinx inventory file
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants