Skip to content

Commit

Permalink
ares is not optional on travis; more debugging
Browse files Browse the repository at this point in the history
  • Loading branch information
jamadden committed Nov 11, 2017
1 parent 7b94b17 commit 6a1a1b5
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@ develop:
# Then start installing our deps so they can be cached. Note that use of --build-options / --global-options / --install-options
# disables the cache.
# We need wheel>=0.26 on Python 3.5. See previous revisions.
${PIP} install -vv -U -r dev-requirements.txt
${PIP} install -v -U -r dev-requirements.txt
cat deps/c-ares/ares_build.h

lint-py27: $(PY27)
PYTHON=python2.7.13 PATH=$(BUILD_RUNTIMES)/versions/python2.7.13/bin:$(PATH) make develop travis_test_linters
Expand Down
4 changes: 3 additions & 1 deletion _setupares.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from _setuputils import DEFINE_MACROS
from _setuputils import glob_many
from _setuputils import dep_abspath
from _setuputils import RUNNING_ON_TRAVIS


CARES_EMBED = should_embed('c-ares')
Expand Down Expand Up @@ -83,7 +84,8 @@ def configure_ares(bext, ext):
define_macros=list(DEFINE_MACROS),
depends=glob_many('src/gevent/dnshelper.c',
'src/gevent/cares_*.[ch]'))
ARES.optional = True

ARES.optional = not RUNNING_ON_TRAVIS


if CARES_EMBED:
Expand Down
1 change: 1 addition & 0 deletions _setuputils.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
PYPY = hasattr(sys, 'pypy_version_info')
WIN = sys.platform.startswith('win')
CFFI_WIN_BUILD_ANYWAY = os.environ.get("PYPY_WIN_BUILD_ANYWAY")
RUNNING_ON_TRAVIS = os.environ.get('TRAVIS')

LIBRARIES = []
DEFINE_MACROS = []
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def run_setup(ext_modules, run_make):
try:
run_setup(EXT_MODULES, run_make=_BUILDING)
except BuildFailed:
if ARES not in EXT_MODULES:
if ARES not in EXT_MODULES or not ARES.optional:
raise
EXT_MODULES.remove(ARES)
run_setup(EXT_MODULES, run_make=_BUILDING)
Expand Down

0 comments on commit 6a1a1b5

Please sign in to comment.