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

Commits on Jul 15, 2015

  1. Moved entry points to setup.cfg.

    cmccully committed Jul 15, 2015
    Configuration menu
    Copy the full SHA
    c7dc98b View commit details
    Browse the repository at this point in the history

  2. Fixed typo in entry_points.

    cmccully committed Jul 15, 2015
    Configuration menu
    Copy the full SHA
    5eb599f View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2015

  1. Switch to container-based Travis infrastructure

    @astrofrog
    astrofrog committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    0236f47 View commit details
    Browse the repository at this point in the history

  2. Added link to list of available apt packages

    @astrofrog
    astrofrog committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    0681cf7 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2015

  1. Merge pull request #133 from astrofrog/travis-container 

    Switch to container-based Travis infrastructure
    @mwcraig
    mwcraig committed Aug 2, 2015
    Configuration menu
    Copy the full SHA
    93b7275 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2015

  1. Merge pull request #130 from cmccully/console 

    Moved entry points to setup.cfg.
    @embray
    embray committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    a956da7 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2015

  1. Analog of astropy/astropy#4141 for package-template

    @embray
    embray committed Sep 10, 2015
    Configuration menu
    Copy the full SHA
    64ba082 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2015

  1. Pin coverage version to 3.7.1

    @astrofrog
    astrofrog committed Oct 4, 2015
    Configuration menu
    Copy the full SHA
    7f4bacf View commit details
    Browse the repository at this point in the history

  2. Use SVG icon for Travis badge [ci skip]

    @astrofrog
    astrofrog committed Oct 4, 2015
    Configuration menu
    Copy the full SHA
    c70c2db View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2015

  1. Make use of ci-helpers for continuous integration on Travis and AppVeyor

    @astrofrog
    astrofrog committed Nov 20, 2015
    Configuration menu
    Copy the full SHA
    cbe7494 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2015

  1. Add some .gitignore entries

    @larrybradley
    larrybradley committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    617ad1b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #146 from larrybradley/gitignore 

    Add some .gitignore entries
    @embray
    embray committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    47618f7 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2016

  1. Merge pull request #140 from astrofrog/use-external-ci-helpers 

    Use external ci-helpers
    @astrofrog
    astrofrog committed Jan 4, 2016
    Configuration menu
    Copy the full SHA
    f977bfb View commit details
    Browse the repository at this point in the history

  2. Adding LTS astropy to matrix and update version numbers of numpy and … 

    …python
    @bsipocz
    bsipocz committed Jan 4, 2016
    Configuration menu
    Copy the full SHA
    db966dd View commit details
    Browse the repository at this point in the history

  3. Update astropy-helpers to v1.1.1

    @bsipocz
    bsipocz committed Jan 4, 2016
    Configuration menu
    Copy the full SHA
    bde8e3d View commit details
    Browse the repository at this point in the history

  4. Adding pass for KeyError for the custom package headers

    @bsipocz
    bsipocz committed Jan 4, 2016
    Configuration menu
    Copy the full SHA
    6d10b98 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2016

  1. Removing python 2.6 and 3.3 from the main matrix and adding simple te… 

    …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
    bsipocz committed Jan 5, 2016
    Configuration menu
    Copy the full SHA
    a8f6daa View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2016

  1. fixing typo [skip ci]

    @bsipocz
    bsipocz committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    ea0664d View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2016

  1. Adding test against the numpy prerelease to the travis matrix, and ch… 

    …anging default numpy version to 'stable'
    @bsipocz
    bsipocz committed Feb 28, 2016
    Configuration menu
    Copy the full SHA
    5240ee6 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2016

  1. update helpers to 1.1.2

    @eteq
    eteq committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    abf0ed1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #147 from bsipocz/helpers_update_1.1.1 

    Update astropy-helpers to v1.1.2
    @eteq
    eteq committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    b85440a View commit details
    Browse the repository at this point in the history

  3. remove unneeded adjust_compiler

    @eteq
    eteq committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    adc9cc6 View commit details
    Browse the repository at this point in the history

  4. update MANIFEST.in to be more careful with the helpers

    @eteq
    eteq committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    76d03d2 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2016

  1. Added subpackage data setup example

    @pllim
    pllim committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    830dcbf View commit details
    Browse the repository at this point in the history

  2. Added test directories for each subpackage

    @pllim
    pllim committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    c9874b5 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2016

  1. Merge pull request #154 from eteq/cleanup-manifest-setup 

    Update setup.py and MANIFEST.in
    @eteq
    eteq committed Apr 15, 2016
    Configuration menu
    Copy the full SHA
    20ad060 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2016

  1. Merge pull request #135 from embray/update-ez-setup 

    Update ez_setup.py
    @astrofrog
    astrofrog committed Apr 30, 2016
    Configuration menu
    Copy the full SHA
    c0af36c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #143 from bsipocz/custom_header_add_keyerror_excep… 

    …tion

Custom header add KeyError exception
    @astrofrog
    astrofrog committed Apr 30, 2016
    Configuration menu
    Copy the full SHA
    de95a3d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #148 from bsipocz/travis_lts_astropy_to_matrix 

    Updating travis template matrix
    @astrofrog
    astrofrog committed Apr 30, 2016
    Configuration menu
    Copy the full SHA
    22696e2 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #158 from pllim/pkgdata-ex 

    Added subpackage data setup example
    @astrofrog
    astrofrog committed Apr 30, 2016
    Configuration menu
    Copy the full SHA
    cea2714 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2016

  1. Replaced RTD domain with Astropy domain.

    @pllim
    pllim committed May 3, 2016
    Configuration menu
    Copy the full SHA
    0c6661a View commit details
    Browse the repository at this point in the history

Commits on May 4, 2016

  1. Fix import for Python 3

    @astrofrog
    astrofrog committed May 4, 2016
    Configuration menu
    Copy the full SHA
    ab7592b View commit details
    Browse the repository at this point in the history

  2. Make sure conftest.py works properly in a clean repository when the v… 

    …ersion file hasn’t been generated yet.
    @astrofrog
    astrofrog committed May 4, 2016
    Configuration menu
    Copy the full SHA
    e1be2ab View commit details
    Browse the repository at this point in the history

  3. Numpy stable is now 1.11. Dropped 1.6 and moved 1.10 to old.

    @pllim
    pllim committed May 4, 2016
    Configuration menu
    Copy the full SHA
    0b90aa5 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2016

  1. Merge pull request #167 from astrofrog/fix-version-conftest 

    Fix import of version in conftest.py
    @astrofrog
    astrofrog committed May 11, 2016
    Configuration menu
    Copy the full SHA
    25b96d5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #168 from pllim/rm-np-1.6 

    Updated Numpy versions on Travis CI tests
    @astrofrog
    astrofrog committed May 11, 2016
    Configuration menu
    Copy the full SHA
    db6edae View commit details
    Browse the repository at this point in the history

  3. Merge pull request #166 from pllim/change-rtd-domain 

    Replaced RTD domain
    @astrofrog
    astrofrog committed May 11, 2016
    Configuration menu
    Copy the full SHA
    417c9d0 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2016

  1. Updated Python 2 Appveyor test to use 2.7 instead of 2.6. Also now us… 

    …e stable versions of Astropy and Numpy.
    @pllim
    pllim committed May 19, 2016
    Configuration menu
    Copy the full SHA
    c9493fb View commit details
    Browse the repository at this point in the history

  2. Modified verbiage as suggested by @bsipocz [skip ci]

    @pllim
    pllim committed May 19, 2016
    Configuration menu
    Copy the full SHA
    83d6200 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2016

  1. update clean section of docs/Makefile to reflect astropy/astropy-help… 

    …ers#235
    @eteq
    eteq committed May 20, 2016
    Configuration menu
    Copy the full SHA
    8a73638 View commit details
    Browse the repository at this point in the history

  2. update docs/Makefile for doctest change

    @eteq
    eteq committed May 20, 2016
    Configuration menu
    Copy the full SHA
    ebc36b7 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2016

  1. Merge pull request #171 from eteq/update-sphinx-makefile 

    Update sphinx makefile to account for "generated" directory
    @eteq
    eteq committed May 25, 2016
    Configuration menu
    Copy the full SHA
    a6d12d6 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2016

  1. Merge pull request #170 from pllim/update-appveyor 

    Updated Python 2 Appveyor test to use 2.7
    @astrofrog
    astrofrog committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    d1da262 View commit details
    Browse the repository at this point in the history

  2. Updated changelog for template

    @astrofrog
    astrofrog committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    4e404f3 View commit details
    Browse the repository at this point in the history

  3. Updated changelog to make it clearer which files need to be updated

    @astrofrog
    astrofrog committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    8c4a096 View commit details
    Browse the repository at this point in the history

  4. fix configparser

    @zblz
    zblz committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    c2aa884 View commit details
    Browse the repository at this point in the history

  5. Update ez_setup.py to latest upstream version

    @larrybradley
    larrybradley committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    2206cb5 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2016

  1. Merge pull request #172 from zblz/configparser 

    Fix configparser in new python 3.5 [#169]
    @astrofrog
    astrofrog committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    ab7cfb5 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2016

  1. Merge pull request #174 from larrybradley/ez_setup_fixes 

    Update ez_setup.py to latest upstream version
    @astrofrog
    astrofrog committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    6d4eb81 View commit details
    Browse the repository at this point in the history

  2. Updated TEMPLATE_CHANGES.md

    @astrofrog
    astrofrog committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    c71bea6 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2016

  1. Update xvfb instructions to SETUP_XVFB variable for ci-helpers

    @astrofrog
    astrofrog committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    d2a21d8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #177 from astrofrog/xvfb 

    Update xvfb instructions to SETUP_XVFB variable for ci-helpers
    @astrofrog
    astrofrog committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    8374636 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2016

  1. Fix typo [skip ci]

    @larrybradley
    larrybradley committed Jun 14, 2016
    Configuration menu
    Copy the full SHA
    4fd2fe8 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2016

  1. Update astropy-helpers version to v1.2

    @bsipocz
    bsipocz committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    02c2f27 View commit details
    Browse the repository at this point in the history

  2. Updating gitignore

    @bsipocz
    bsipocz committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    1a4c583 View commit details
    Browse the repository at this point in the history

  3. Fix configparser in docs/conf

    @bsipocz
    bsipocz committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    7345583 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2016

  1. Merge pull request #180 from bsipocz/configparser_fix_import 

    Configparser fix import in docs/conf
    @astrofrog
    astrofrog committed Jun 30, 2016
    Configuration menu
    Copy the full SHA
    ba9bf42 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2016

  1. Merge pull request #178 from larrybradley/typo 

    Fix typo
    @astrofrog
    astrofrog committed Jul 2, 2016
    Configuration menu
    Copy the full SHA
    3b7d6fa View commit details
    Browse the repository at this point in the history

  2. Updated TEMPLATE_CHANGES.md

    @astrofrog
    astrofrog committed Jul 2, 2016
    Configuration menu
    Copy the full SHA
    6f5e0ca View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2016

  1. Removed Python 2.6 support.

    Curtis McCully committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    6894b6a View commit details
    Browse the repository at this point in the history

  2. Added PR number.

    Curtis McCully committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    1171aa8 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2016

  1. Merge pull request #183 from cmccully/py26 

    Removed Python 2.6 in travis.yml.
    @astrofrog
    astrofrog committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    f353cf8 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2016

  1. Adding template for usage of CONDA_CHANNELS in CI configs

    @bsipocz
    bsipocz committed Aug 10, 2016
    Configuration menu
    Copy the full SHA
    535a7a2 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2016

  1. Merge pull request #188 from bsipocz/conda_channels 

    Adding template for usage of CONDA_CHANNELS in CI configs
    @astrofrog
    astrofrog committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    7bc089f View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2016

  1. Added .eggs to git ignore.

    Curtis McCully committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    97e7796 View commit details
    Browse the repository at this point in the history

  2. Updates to median cleaning. Added tests to catch integer masks.

    Curtis McCully committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    d319b5d View commit details
    Browse the repository at this point in the history

  3. Merge with template upstream.

    Curtis McCully committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    5cb1f5d View commit details
    Browse the repository at this point in the history

  4. Updates to test fix for median clean. Merge updated package template.

    Curtis McCully committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    8a19404 View commit details
    Browse the repository at this point in the history

  5. Fix in setup.cfg entry points.

    Curtis McCully committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    9db354b View commit details
    Browse the repository at this point in the history

  6. Merge fix in conf.py in docs.

    Curtis McCully committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    e8ecd02 View commit details
    Browse the repository at this point in the history

  7. Removed spurious >>> HEAD

    Curtis McCully committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    c7d46b8 View commit details
    Browse the repository at this point in the history

  8. Fixed setup_package.py to correctly detect the compiler if it is diff… 

    …erent than the system one.
    Curtis McCully committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    4423c58 View commit details
    Browse the repository at this point in the history

  9. Fix to travis file to require scipy for tests.

    Curtis McCully committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    ac67b62 View commit details
    Browse the repository at this point in the history

  10. Fix to travis file to require scipy for tests.

    Curtis McCully committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    5c9ad12 View commit details
    Browse the repository at this point in the history