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.

Sign up for GitHub

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

Jump to bottom

Merge in updates and fixes. #21

Merged
merged 74 commits into from
Aug 16, 2016
Merged

Merge in updates and fixes. #21

merged 74 commits into from
Aug 16, 2016

Conversation

cmccully
Copy link
Contributor

No description provided.

cmccully and others added 30 commits July 15, 2015 10:57
Moved entry points to setup.cfg.
c7dc98b
Fixed typo in entry_points.
5eb599f
@astrofrog
Switch to container-based Travis infrastructure
0236f47
@astrofrog
Added link to list of available apt packages
0681cf7
@mwcraig
Merge pull request #133 from astrofrog/travis-container
93b7275 
Switch to container-based Travis infrastructure
@embray
Merge pull request #130 from cmccully/console
a956da7 
Moved entry points to setup.cfg.
@embray
Analog of astropy/astropy#4141 for package-template
64ba082
@astrofrog
Pin coverage version to 3.7.1
7f4bacf
@astrofrog
Use SVG icon for Travis badge [ci skip]
c70c2db
@astrofrog
Make use of ci-helpers for continuous integration on Travis and AppVeyor
cbe7494
@larrybradley
Add some .gitignore entries
617ad1b
@embray
Merge pull request #146 from larrybradley/gitignore
47618f7 
Add some .gitignore entries
@astrofrog
Merge pull request #140 from astrofrog/use-external-ci-helpers
f977bfb 
Use external ci-helpers
@bsipocz
Adding LTS astropy to matrix and update version numbers of numpy and …
db966dd 
…python
@bsipocz
Update astropy-helpers to v1.1.1
bde8e3d
@bsipocz
Adding pass for KeyError for the custom package headers
6d10b98
@bsipocz
Removing python 2.6 and 3.3 from the main matrix and adding simple te…
a8f6daa 
…st for them later as np 1.10 is not available for them in conda and thus they are run with np 1.9
@bsipocz
fixing typo [skip ci]
ea0664d
@bsipocz
Adding test against the numpy prerelease to the travis matrix, and ch…
5240ee6 
…anging default numpy version to 'stable'
@eteq
update helpers to 1.1.2
abf0ed1
@eteq
Merge pull request #147 from bsipocz/helpers_update_1.1.1
b85440a 
Update astropy-helpers to v1.1.2
@eteq
remove unneeded adjust_compiler
adc9cc6
@eteq
update MANIFEST.in to be more careful with the helpers
76d03d2
@pllim
Added subpackage data setup example
830dcbf
@pllim
Added test directories for each subpackage
c9874b5
@eteq
Merge pull request #154 from eteq/cleanup-manifest-setup
20ad060 
Update setup.py and MANIFEST.in
@astrofrog
Merge pull request #135 from embray/update-ez-setup
c0af36c 
Update ez_setup.py
@astrofrog
Merge pull request #143 from bsipocz/custom_header_add_keyerror_excep…
de95a3d 
…tion

Custom header add KeyError exception
@astrofrog
Merge pull request #148 from bsipocz/travis_lts_astropy_to_matrix
22696e2 
Updating travis template matrix
@astrofrog
Merge pull request #158 from pllim/pkgdata-ex
cea2714 
Added subpackage data setup example
astrofrog and others added 27 commits June 2, 2016 19:20
@astrofrog
Merge pull request #172 from zblz/configparser
ab7cfb5 
Fix configparser in new python 3.5 [#169]
@astrofrog
Merge pull request #174 from larrybradley/ez_setup_fixes
6d4eb81 
Update ez_setup.py to latest upstream version
@astrofrog
Updated TEMPLATE_CHANGES.md
c71bea6
@astrofrog
Update xvfb instructions to SETUP_XVFB variable for ci-helpers
d2a21d8
@astrofrog
Merge pull request #177 from astrofrog/xvfb
8374636 
Update xvfb instructions to SETUP_XVFB variable for ci-helpers
@larrybradley
Fix typo [skip ci]
4fd2fe8
@bsipocz
Update astropy-helpers version to v1.2
02c2f27
@bsipocz
Updating gitignore
1a4c583
@bsipocz
Fix configparser in docs/conf
7345583
@astrofrog
Merge pull request #180 from bsipocz/configparser_fix_import
ba9bf42 
Configparser fix import in docs/conf
@astrofrog
Merge pull request #178 from larrybradley/typo
3b7d6fa 
Fix typo
@astrofrog
Updated TEMPLATE_CHANGES.md
6f5e0ca
Removed Python 2.6 support.
6894b6a
Added PR number.
1171aa8
@astrofrog
Merge pull request #183 from cmccully/py26
f353cf8 
Removed Python 2.6 in travis.yml.
@bsipocz
Adding template for usage of CONDA_CHANNELS in CI configs
535a7a2
@astrofrog
Merge pull request #188 from bsipocz/conda_channels
7bc089f 
Adding template for usage of CONDA_CHANNELS in CI configs
Added .eggs to git ignore.
97e7796
Updates to median cleaning. Added tests to catch integer masks.
d319b5d
Merge with template upstream.
5cb1f5d
Updates to test fix for median clean. Merge updated package template.
8a19404
Fix in setup.cfg entry points.
9db354b
Merge fix in conf.py in docs.
e8ecd02
Removed spurious >>> HEAD
c7d46b8
Fixed setup_package.py to correctly detect the compiler if it is diff…
4423c58 
…erent than the system one.
Fix to travis file to require scipy for tests.
ac67b62
Fix to travis file to require scipy for tests.
5c9ad12
@coveralls
Copy link

Coverage Status

Coverage remained the same at 100.0% when pulling 5c9ad12 on cmccully:master into 81c105d on astropy:master.

@cmccully cmccully merged commit 8501f27 into astropy:master Aug 16, 2016
@cmccully cmccully mentioned this pull request Mar 23, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@cmccully @coveralls @astrofrog @mwcraig @embray @larrybradley @bsipocz @eteq @pllim @zblz