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

Reorganize setup_helpers a bit - #110

Merged
embray merged 1 commit into
astropy:masterfrom
embray:reorg
Dec 11, 2014
Merged

embray merged 1 commit into
astropy:masterfrom
embray:reorg

Conversation

@embray

@embray embray commented Dec 9, 2014

Copy link
Copy Markdown
Member

Broke apart and reorganized much of astropy_helpers.setup_helpers.

Most of the code related to implementing individual distutils commands
has been moved into an astropy_helpers.commands/ subpackage, with a
module devoted to each command. Some of these modules are very short
and seem a bit silly, but this organization is simply to match the
organization of distutils and setuptools. It also makes it easy to find
where a given command is implemented.

Also moved most of the functions related to introspecting distutils into
a new distutils_helpers module.

This was part of working on support for custom pre-/post-command hooks, and while it is not required for that work I felt like setup_helpers was getting a bit unwieldy and figured I should do something about that before adding more to it.

@embray embray added this to the v1.0 milestone Dec 9, 2014
@embray

embray commented Dec 9, 2014

Copy link
Copy Markdown
Member Author

Mysterious unrelated failures that seem to have something to do with the test of build_sphinx -w.

@embray

embray commented Dec 11, 2014

Copy link
Copy Markdown
Member Author

I will rebase this on #111 again--hopefully then the tests will pass.

@embray

embray commented Dec 11, 2014

Copy link
Copy Markdown
Member Author

There seems to be some network issue--either on the Ubuntu side or on the Travis side--preventing Ubuntu packages from being installed, hence causing the tests to error. Hopefully this will resolve itself soon...

@astrofrog

Copy link
Copy Markdown
Member

@embray - this should be fixed by d4c04df - try rebasing

@astrofrog

Copy link
Copy Markdown
Member

(it happened in astropy core and other packages too)

@astrofrog

Copy link
Copy Markdown
Member

Looks like it is indeed fixed.

Most of the code related to implementing individual distutils commands
has been moved into an astropy_helpers.commands/ subpackage, with a
module devoted to each command.  Some of these modules are very short
and seem a bit silly, but this organization is simply to match the
organization of distutils and setuptools.  It also makes it easy to find
where a given command is implemented.

Also moved most of the functions related to introspecting distutils into
a new distutils_helpers module.
@embray

embray commented Dec 11, 2014

Copy link
Copy Markdown
Member Author

Rebased...

@embray embray mentioned this pull request Dec 11, 2014
@embray

embray commented Dec 11, 2014

Copy link
Copy Markdown
Member Author

Hooray.

embray added a commit that referenced this pull request Dec 11, 2014
Reorganize setup_helpers a bit
@embray
embray merged commit 7582b85 into astropy:master Dec 11, 2014
@embray
embray deleted the reorg branch December 11, 2014 20:08
@astrofrog

Copy link
Copy Markdown
Member

@embray - just for info, this breaks the setup in the astropy core package. Is that intentional or should we try and make sure the changes are backward-compatible?

@astrofrog

Copy link
Copy Markdown
Member

In particular, it looks like write_if_different has been completely removed but is needed by astropy.wcs - has it changed name?

@astrofrog

Copy link
Copy Markdown
Member

Just to claify, I ran into this when trying to get astropy/astropy#3166 to work with your generalized hooks, but I think the changes here is what broke things.

@embray

embray commented Dec 15, 2014

Copy link
Copy Markdown
Member Author

Oh, I didn't know. I took out write_if_different since it looked like it wasn't used anywhere.

Hmm, I feel like maybe that should just go into astropy.utils and be used from there. But in the meantime I'll put it back in.

embray added a commit that referenced this pull request Dec 15, 2014
…ed since it is not used within astropy_helpers, but it is being used externally. However, tehre were actually two copies of this function in astropy_helpers, somehow. One in setup_helpers and one in utils. I have added it back to utils but also included it in setup_helpers via import.
embray added a commit that referenced this pull request Dec 15, 2014
embray added a commit that referenced this pull request Dec 15, 2014
… setup_helpers should still work, and added a previously overlooked changelog entry for #110.
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.

2 participants