Merge pull request #218 from lpsinger/run_pykg_config_distribution

Adapt to some changes in behavior of pkg_resources.run_script
healpy · Jan 13, 2015 · b65336c · b65336c
2 parents b103f64 + 1aa8c44
commit b65336c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ healpy/src/_pixelfunc.cpp
 healpy/src/_sphtools.cpp
 healpy.egg-info
 dist
+.eggs
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -5,7 +5,7 @@ exclude cfitsio/*pdf cfitsio/*ps cfitsio/*doc cfitsio/*tex
 prune cfitsio/docs
 exclude *.so
 exclude *.a
-include COPYING CITATION INSTALL.rst README.rst MANIFEST.in CHANGELOG.rst ez_setup.py pykg_config.py
+include COPYING CITATION INSTALL.rst README.rst MANIFEST.in CHANGELOG.rst ez_setup.py run_pykg_config.py
 include healpy/src/_healpy_utils.h
 include healpy/src/_query_disc.cpp
 include healpy/src/_sphtools.cpp

diff --git a/pykg_config.py b/pykg_config.py
diff --git a/run_pykg_config.py b/run_pykg_config.py
@@ -0,0 +1,6 @@
+# Helper to run pykg-config, whether it is installed or lives in a zipped egg.
+from setuptools import Distribution
+from pkg_resources import run_script
+requirement = 'pykg-config >= 1.2.0'
+Distribution().fetch_build_eggs(requirement)
+run_script(requirement, 'pykg-config.py')
diff --git a/setup.py b/setup.py
@@ -128,7 +128,7 @@ def check_output(*popenargs, **kwargs):
         raise ValueError
     log.warn('pkg-config is not installed, falling back to pykg-config')
     setup_requires = ['pykg-config >= 1.2.0']
-    os.environ['PKG_CONFIG'] = sys.executable + ' ' + os.path.abspath('pykg_config.py')
+    os.environ['PKG_CONFIG'] = sys.executable + ' ' + os.path.abspath('run_pykg_config.py')
 
 
 class build_external_clib(build_clib):