Skip to content

Conversation

@bsipocz
Copy link
Member

@bsipocz bsipocz commented Oct 13, 2015

These are for the 1.1 branch, some of these are obviously in master, too. I can open another one for master later.
(I didn't included the [skip ci] as there was a seemingly unused import, and prefer to run the test whenever those are removed).

@embray
Copy link
Member

embray commented Oct 13, 2015

Yeah it would actually be easier if this was just a PR against master that I could then backport (excluding any irrelevant changes in the process). This is fine for now but please open the same PR for master or else the changes won't propagate beyond the 1.1.x branch.

@embray embray added the Docs label Oct 13, 2015
@embray embray added this to the v1.1.0 milestone Oct 13, 2015
@bsipocz bsipocz mentioned this pull request Oct 13, 2015
@embray embray modified the milestones: v1.0.6, v1.1.0 Oct 13, 2015
@embray
Copy link
Member

embray commented Oct 13, 2015

I changed this to 1.0.6 since I'm betting a lot of these port to the 1.0.x branch as well (or maybe not--we'll see!)

embray added a commit that referenced this pull request Oct 21, 2015
@embray embray merged commit bc8e4f6 into astropy:v1.1.x Oct 21, 2015
embray added a commit that referenced this pull request Oct 22, 2015
Fixing typos
Conflicts:
	astropy/coordinates/builtin_frames/ecliptic.py
	astropy/coordinates/representation.py
	astropy/coordinates/sites.py
	astropy/io/ascii/daophot.py
	astropy/io/ascii/misc.py
	astropy/modeling/projections.py
	astropy/nddata/utils.py
	astropy/stats/tests/test_sigma_clipping.py
	astropy/table/index.py
	astropy/table/operations.py
	astropy/table/table.py
	astropy/time/core.py
	astropy/time/tests/test_basic.py
	astropy/time/utils.py
	astropy/units/tests/test_logarithmic.py
	astropy/utils/compat/numpy/lib/stride_tricks.py
	docs/modeling/bounding-boxes.rst
	docs/testhelpers.rst
embray added a commit that referenced this pull request Oct 22, 2015
Fixing typos
Conflicts:
	astropy/coordinates/builtin_frames/ecliptic.py
	astropy/coordinates/representation.py
	astropy/coordinates/sites.py
	astropy/io/ascii/daophot.py
	astropy/io/ascii/misc.py
	astropy/modeling/projections.py
	astropy/nddata/utils.py
	astropy/stats/tests/test_sigma_clipping.py
	astropy/table/index.py
	astropy/table/operations.py
	astropy/table/table.py
	astropy/time/core.py
	astropy/time/tests/test_basic.py
	astropy/time/utils.py
	astropy/units/tests/test_logarithmic.py
	astropy/utils/compat/numpy/lib/stride_tricks.py
	docs/modeling/bounding-boxes.rst
	docs/testhelpers.rst
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants