Skip to content

Commit

Permalink
Merge pull request #108 from astrofrog/update-helpers-0.4.3
Browse files Browse the repository at this point in the history
Updated astropy-helpers to v0.4.3
  • Loading branch information
astrofrog committed Oct 22, 2014
2 parents 158ac1f + 69add47 commit 467442e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
16 changes: 16 additions & 0 deletions ah_bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,16 @@
from setuptools.package_index import PackageIndex
from setuptools.sandbox import run_setup

# Note: The following import is required as a workaround to
# https://github.com/astropy/astropy-helpers/issues/89; if we don't import this
# module now, it will get cleaned up after `run_setup` is called, but that will
# later cause the TemporaryDirectory class defined in it to stop working when
# used later on by setuptools
try:
import setuptools.py31compat
except ImportError:
pass

# TODO: Maybe enable checking for a specific version of astropy_helpers?
DIST_NAME = 'astropy-helpers'
PACKAGE_NAME = 'astropy_helpers'
Expand Down Expand Up @@ -186,6 +196,12 @@ def use_astropy_helpers(path=None, download_if_needed=None, index_url=None,
if auto_upgrade is None:
auto_upgrade = AUTO_UPGRADE

# If this is a release then the .git directory will not exist so we
# should not use git.
git_dir_exists = os.path.exists(os.path.join(os.path.dirname(__file__), '.git'))
if use_git is None and not git_dir_exists:
use_git = False

# Declared as False by default--later we check if astropy-helpers can be
# upgraded from PyPI, but only if not using a source distribution (as in
# the case of import from a git submodule)
Expand Down

0 comments on commit 467442e

Please sign in to comment.