Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Package template update #107

Merged
merged 33 commits into from
Jun 5, 2014
Merged

Conversation

mwcraig
Copy link
Member

@mwcraig mwcraig commented Jun 4, 2014

Closes #93

mdboom and others added 30 commits March 14, 2014 13:02
Simplify package-template usage
…will always copy over the latest version of ah_bootstrap (so that we can test ah_bootstrap itself), but there should still be a default copy of it in the package-template repo as well
…ludes astropy_helpers as a submodule. Yes, astropy_helpers is now a submodule of package_template which is a submodule of astropy_helpers
Change ``clean`` rule to remove generated docs
Updated astropy-helpers to latest version
Fixing docs links in package test function
This version includes fixes for the coverage testing in affiliated packages.
Updated astropy-helpers to latest version.
Care is taken to use a numpy wheel whose version matches the scipy/astropy wheels.

Previous commit messages:
Use development astropy for test --coverage
Install coverage when needed
Add cython to the travis build environment, controlled by an environmental variable
Also added a few more words of advice to the travis part of the README
Restore -w option to build_sphinx
Change URL for numpy-specific wheels and make scipy an optional install
Fix latest stable numpy version
Several tweaks to improve performance and reduce unnecessary tests
Remove debugging statements and cython install in egg_only
astrofrog and others added 3 commits May 23, 2014 21:35
…rride

Don't override package data after it's been determined from setup_package.py files
…emplate-update

Conflicts:
	.travis.yml
	MANIFEST.in
	README.rst
	ccdproc/__init__.py
	ccdproc/tests/coveragerc
	docs/conf.py
	docs/packagename/index.rst
	packagename/tests/setup_package.py
	setup.py
@mwcraig
Copy link
Member Author

mwcraig commented Jun 5, 2014

@crawfordsm -- do you object to merging this? You will definitely need to update your local repo if I merge. There is still one warning coming up in the documentation build, related to the switch to astropy_helpers

@crawfordsm
Copy link
Member

No problem with merging this and merge when you are ready.

mwcraig added a commit that referenced this pull request Jun 5, 2014
@mwcraig mwcraig merged commit e344354 into astropy:master Jun 5, 2014
@mwcraig mwcraig deleted the package-template-update branch June 5, 2014 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rebase onto the latest package template
6 participants