Skip to content

Commit

Permalink
Merge pull request #229 from cdeil/ah-0.4.4-update
Browse files Browse the repository at this point in the history
Updated astropy-helpers to v0.4.4
  • Loading branch information
cdeil committed Jan 16, 2015
2 parents 9019576 + 44e1528 commit 4afe85a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions ah_bootstrap.py
Expand Up @@ -304,7 +304,7 @@ def _do_download(version='', find_links=None, index_url=None):
allow_hosts = None
# Annoyingly, setuptools will not handle other arguments to
# Distribution (such as options) before handling setup_requires, so it
# is not straightfoward to programmatically augment the arguments which
# is not straightforward to programmatically augment the arguments which
# are passed to easy_install
class _Distribution(Distribution):
def get_option_dict(self, command_name):
Expand Down Expand Up @@ -405,7 +405,7 @@ def _check_submodule(path, use_git=True, offline=False):
Check if the given path is a git submodule.
See the docstrings for ``_check_submodule_using_git`` and
``_check_submodule_no_git`` for futher details.
``_check_submodule_no_git`` for further details.
"""

if use_git:
Expand Down Expand Up @@ -512,7 +512,7 @@ def _check_submodule_no_git(path):

# This is a minimal reader for gitconfig-style files. It handles a few of
# the quirks that make gitconfig files incompatible with ConfigParser-style
# files, but does not support the full gitconfig syntaix (just enough
# files, but does not support the full gitconfig syntax (just enough
# needed to read a .gitmodules file).
gitmodules_fileobj = io.StringIO()

Expand Down

0 comments on commit 4afe85a

Please sign in to comment.