Skip to content
This repository has been archived by the owner on May 25, 2022. It is now read-only.

Cleanup PR #226

Merged
merged 7 commits into from
Jun 3, 2016
Merged

Cleanup PR #226

merged 7 commits into from
Jun 3, 2016

Conversation

bsipocz
Copy link
Member

@bsipocz bsipocz commented Apr 15, 2016

This PR does a few low prio cleanup tasks:

  • Opts in the travis container for the linux builds.
  • Removes the locally patched version of the sphinx extension viewcode
  • Fixes PEP8, except long lines and except the few third party files hosted in sphinx/ext

I think the only controversial point is the viewcode removal. The patch got included 1.5 years ago into 1.3b1. I think it's a long enough time, and we can remove our local version.

Note that this fails, but when built on top of #225 the tests pass (https://travis-ci.org/bsipocz/astropy-helpers/builds/123386933).

raise DistutilsModuleError(
'cannot find hook {0}: {1}'.format(hook, err))
'cannot find hook {0}: {1}'.format(hook, err))
Copy link
Member

Choose a reason for hiding this comment

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

This looks like a bug. My guess is pylint or whatever warned that exc is not used, but actually it is on this line but the variable was accidentally renamed err here. Should change back to as exc and change err to exc here.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks, indeed.

@eteq
Copy link
Member

eteq commented Apr 20, 2016

Hmm, it's a fair question what the oldest version of sphinx we want to support is. I think older sphinxes are less of a priority because it's sort of a "dev-oriented" thing to need to build the sphinx docs. @astrofrog or anyone else have any opinions?

Note, though, @bsipocz, that I think it makes sense to update the need_sphinx in conf.py to 1.3 if you're removing the viewcode.

@bsipocz
Copy link
Member Author

bsipocz commented Apr 20, 2016

@eteq - changed need_sphinx to 1.3, and rebased. I guess this will need a changelog entry, but not sure which one; 1.2?

@eteq
Copy link
Member

eteq commented Apr 20, 2016

Hmm, yeah, now that you ask, I suppose upgrading the required sphinx is something we wouldn't want in a bugfix. So I'd say 1.2

@eteq eteq added this to the v1.2 milestone Apr 20, 2016
@eteq
Copy link
Member

eteq commented Apr 20, 2016

@bsipocz - actually, @astrofrog raised a good point that this affects the affiliated packages, so you should ask on astropy-affiliated-maintainers if anyone minds having to upgrade to 1.3 . If everyone there is OK with it I'd say it's ok to include this for helpers v1.2

@bsipocz
Copy link
Member Author

bsipocz commented Apr 20, 2016

That's a good point, I'll send out an e-mail.

@bsipocz bsipocz force-pushed the pep8_and_container_travis branch from 964b372 to 76d4bd8 Compare May 17, 2016 12:31
@bsipocz
Copy link
Member Author

bsipocz commented May 17, 2016

@eteq - There was no reaction to the e-mail about this, so I assume everyone is OK with upgrading to sphinx >=1.3.
There was quite many changes in the helpers recently, so I rebased the PR.

@astrofrog
Copy link
Member

@bsipocz - can you rebase?

@bsipocz bsipocz force-pushed the pep8_and_container_travis branch from 76d4bd8 to ca024ed Compare June 2, 2016 22:18
@bsipocz
Copy link
Member Author

bsipocz commented Jun 2, 2016

@astrofrog - Done

@astrofrog
Copy link
Member

I think AppVeyor is broken for unrelated reasons, so I'll go ahead and merge and debug that in another issue.

@astrofrog astrofrog merged commit 5c3ec54 into astropy:master Jun 3, 2016
@bsipocz
Copy link
Member Author

bsipocz commented Jun 3, 2016

I was just about to open an issue about the appveyor failures, as said on one of the other PR it's around for a long time.

astrofrog added a commit to astropy/sphinx-automodapi that referenced this pull request Jan 27, 2018
astrofrog added a commit to astropy/sphinx-automodapi that referenced this pull request Jan 27, 2018
astrofrog added a commit to astropy/sphinx-astropy that referenced this pull request Jan 29, 2018
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