Merge branch 'source-reorg'

.gitignore

@@ -3,20 +3,20 @@ build/
 .runtimes
 .tox/
 *.so
+*.o
 *.egg-info
 gevent.*.[ch]
-gevent/corecext.pyx
-gevent/__pycache__
-gevent/libev
-gevent/_corecffi.c
-gevent/_corecffi.o
+src/gevent/libev/corecext.pyx
+src/gevent/__pycache__
+src/gevent/libev/_corecffi.c
+src/gevent/libev/_corecffi.o
 Makefile.ext
 MANIFEST
 *_flymake.py
 
-greentest/.coverage\.*
-greentest/htmlcov
-greentest/.coverage
+src/greentest/.coverage\.*
+src/greentest/htmlcov
+src/greentest/.coverage
 
 doc/changelog.rst
 doc/_build
@@ -33,40 +33,40 @@ doc/gevent.*.rst
 !doc/gevent.wsgi.rst
 
 # Artifacts of configuring in place
-c-ares/config.log
-c-ares/config.status
-c-ares/stamp-h1
-c-ares/stamp-h2
-c-ares/ares_build.h.orig
-c-ares/ares_config.h
-c-ares/.libs
-c-ares/*.o
-c-ares/*.lo
-c-ares/*.la
-c-ares/.deps
-c-ares/acountry
-c-ares/adig
-c-ares/ahost
-c-ares/Makefile
-c-ares/libtool
-c-ares/libcares.pc
-c-ares/test/.deps
-c-ares/test/Makefile
-c-ares/test/config.log
-c-ares/test/config.status
-c-ares/test/libtool
-c-ares/test/stamp-h1
-libev/.deps
-libev/Makefile
-libev/config.log
-libev/config.h
-libev/config.status
-libev/libtool
-libev/stamp-h1
-libev/.libs
-libev/*.lo
-libev/*.la
-libev/*.o
+deps/c-ares/config.log
+deps/c-ares/config.status
+deps/c-ares/stamp-h1
+deps/c-ares/stamp-h2
+deps/c-ares/ares_build.h.orig
+deps/c-ares/ares_config.h
+deps/c-ares/.libs
+deps/c-ares/*.o
+deps/c-ares/*.lo
+deps/c-ares/*.la
+deps/c-ares/.deps
+deps/c-ares/acountry
+deps/c-ares/adig
+deps/c-ares/ahost
+deps/c-ares/Makefile
+deps/c-ares/libtool
+deps/c-ares/libcares.pc
+deps/c-ares/test/.deps
+deps/c-ares/test/Makefile
+deps/c-ares/test/config.log
+deps/c-ares/test/config.status
+deps/c-ares/test/libtool
+deps/c-ares/test/stamp-h1
+deps/libev/.deps
+deps/libev/Makefile
+deps/libev/config.log
+deps/libev/config.h
+deps/libev/config.status
+deps/libev/libtool
+deps/libev/stamp-h1
+deps/libev/.libs
+deps/libev/*.lo
+deps/libev/*.la
+deps/libev/*.o
 
 # running setup.py on PyPy
 config.h

.landscape.yml

@@ -24,29 +24,29 @@ ignore-paths:
   - scripts/
   # This file has invalid syntax for Python 3, which is how
   # landscape.io runs things...
-  - gevent/_util_py2.py
+  - src/gevent/_util_py2.py
   # ...and this file has invalid syntax for Python 2, which is how
   # travis currently runs things. sigh.
-  - gevent/_socket3.py
+  - src/gevent/_socket3.py
   # This is vendored with minimal changes
-  - gevent/_tblib.py
+  - src/gevent/_tblib.py
   # likewise
-  - greentest/six.py
+  - src/greentest/six.py
   # This triggers https://github.com/PyCQA/pylint/issues/846 on Travis,
   # but the file is really small, so it's better to skip this one
   # file than disable that whole check.
-  - gevent/core.py
+  - src/gevent/core.py
   # sadly, this one is complicated
   - setup.py
-  - greentest/getaddrinfo_module.py
+  - src/greentest/getaddrinfo_module.py
 ignore-patterns:
   # disabled code
-  - ^greentest/xtest_.*py
+  - ^src/greentest/xtest_.*py
   # standard library code
-  - ^greentest/2.*
-  - ^greentest/3.*
+  - ^src/greentest/2.*
+  - ^src/greentest/3.*
   # benchmarks that aren't used/changed much
-  - ^greentest/bench_.*py
+  - ^src/greentest/bench_.*py
 
 pyroma:
   run: true

MANIFEST.in

-recursive-include greentest *
+recursive-include src/greentest *
 recursive-include examples *
-recursive-include gevent *
+recursive-include src/gevent *
 recursive-include doc *
-recursive-include libev *
-recursive-include c-ares *
+recursive-include deps *
 recursive-include util *
 
 include LICENSE
@@ -18,6 +17,7 @@ include Makefile.ext
 include known_failures.py
 include *.yml
 include *.txt
+include _setup*.py
 
 include tox.ini
 include .pep8
@@ -40,14 +40,14 @@ global-exclude *.la
 global-exclude config.log config.status
 prune doc/_build
 global-exclude *.pyc
-recursive-exclude greentest .coverage
-prune greentest/htmlcov
-recursive-exclude c-ares stamp-h? ares_build.h.orig
-prune libev/.deps
-recursive-exclude libev Makefile libtool stamp-h? config.h
+recursive-exclude src/greentest .coverage
+prune src/greentest/htmlcov
+recursive-exclude deps/c-ares stamp-h? ares_build.h.orig
+prune deps/libev/.deps
+recursive-exclude deps/libev Makefile libtool stamp-h? config.h
 # This is the output of _corecffi_build.py and may be particular
 # to each CFFI version/platform
-recursive-exclude gevent _corecffi.c
+recursive-exclude src/gevent _corecffi.c
 # See comments in Makefile; this is renamed to Makefile.ext
 # this exclude keeps check-manifest from complaining
 exclude Makefile

Makefile

@@ -12,48 +12,56 @@ export PATH:=$(BUILD_RUNTIMES)/snakepit:$(TOOLS):$(PATH)
 export LC_ALL=C.UTF-8
 
 
-all: gevent/gevent.corecext.c gevent/gevent.ares.c gevent/gevent._semaphore.c
+all: src/gevent/libev/gevent.corecext.c src/gevent/gevent.ares.c src/gevent/gevent._semaphore.c
 
-gevent/gevent.corecext.c: gevent/corecext.ppyx gevent/libev.pxd util/cythonpp.py
-	$(PYTHON) util/cythonpp.py -o gevent.corecext.c gevent/corecext.ppyx
+src/gevent/libev/gevent.corecext.c: src/gevent/libev/corecext.ppyx src/gevent/libev/libev.pxd util/cythonpp.py
+	$(PYTHON) util/cythonpp.py -o gevent.corecext.c --module-name gevent.libev.corecext.pyx src/gevent/libev/corecext.ppyx
 	echo '#include "callbacks.c"' >> gevent.corecext.c
-	mv gevent.corecext.* gevent/
+	mv gevent.corecext.* src/gevent/libev/
 
-gevent/gevent.ares.c: gevent/ares.pyx gevent/*.pxd
-	$(CYTHON) -o gevent.ares.c gevent/ares.pyx
-	mv gevent.ares.* gevent/
+src/gevent/gevent.ares.c: src/gevent/ares.pyx src/gevent/*.pxd
+	$(CYTHON) -o gevent.ares.c src/gevent/ares.pyx
+	mv gevent.ares.* src/gevent/
 
-gevent/gevent._semaphore.c: gevent/_semaphore.py gevent/_semaphore.pxd
+src/gevent/gevent._semaphore.c: src/gevent/_semaphore.py src/gevent/_semaphore.pxd
 # On PyPy, if we wanted to use Cython to compile _semaphore.py, we'd
 # need to have _semaphore named as a .pyx file so it doesn't get
 # loaded in preference to the .so. (We want to keep the definitions
 # separate in a .pxd file for ease of reading, and that only works
 # with .py files, so we'd have to copy them back and forth.)
-#	cp gevent/_semaphore.pyx gevent/_semaphore.py
-	$(CYTHON) -o gevent._semaphore.c gevent/_semaphore.py
-	mv gevent._semaphore.* gevent/
-#	rm gevent/_semaphore.py
+#	cp src/gevent/_semaphore.pyx src/gevent/_semaphore.py
+	$(CYTHON) -o gevent._semaphore.c src/gevent/_semaphore.py
+	mv gevent._semaphore.* src/gevent/
+#	rm src/gevent/_semaphore.py
 
 clean:
-	rm -f corecext.pyx gevent/corecext.pyx
-	rm -f gevent.corecext.c gevent.corecext.h gevent/gevent.corecext.c gevent/gevent.corecext.h
-	rm -f gevent.ares.c gevent.ares.h gevent/gevent.ares.c gevent/gevent.ares.h
-	rm -f gevent._semaphore.c gevent._semaphore.h gevent/gevent._semaphore.c gevent/gevent._semaphore.h
-	rm -f gevent/*.so
-	rm -rf gevent/__pycache__
-	rm -rf gevent/*.pyc
+	rm -f corecext.pyx src/gevent/libev/corecext.pyx
+	rm -f gevent.corecext.c gevent.corecext.h src/gevent/libev/gevent.corecext.c src/gevent/libev/gevent.corecext.h
+	rm -f gevent.ares.c gevent.ares.h src/gevent/gevent.ares.c src/gevent/gevent.ares.h
+	rm -f gevent._semaphore.c gevent._semaphore.h src/gevent/gevent._semaphore.c src/gevent/gevent._semaphore.h
+	rm -f src/gevent/*.so src/gevent/libev/*.so
+	rm -rf src/gevent/libev/*.o src/gevent/*.o
+	rm -rf src/gevent/__pycache__ src/greentest/__pycache__ src/gevent/libev/__pycache__
+	rm -rf src/gevent/*.pyc src/greentest/*.pyc src/gevent/libev/*.pyc
+	rm -rf src/greentest/htmlcov src/greentest/.coverage
+	rm -rf build
+
+distclean: clean
+	rm -rf dist
+	rm -rf deps/libev/config.h deps/libev/config.log deps/libev/config.status deps/libev/.deps deps/libev/.libs
+	rm -rf deps/c-ares/config.h deps/c-ares/config.log deps/c-ares/config.status deps/c-ares/.deps deps/c-ares/.libs
 
 doc:
 	cd doc && PYTHONPATH=.. make html
 
 whitespace:
-	! find . -not -path "*.pem" -not -path "./.eggs/*" -not -path "./greentest/htmlcov/*" -not -path "./greentest/.coverage.*" -not -path "./.tox/*" -not -path "*/__pycache__/*" -not -path "*.so" -not -path "*.pyc" -not -path "./.git/*" -not -path "./build/*" -not -path "./libev/*" -not -path "./gevent/libev/*" -not -path "./gevent.egg-info/*" -not -path "./dist/*" -not -path "./.DS_Store" -not -path "./c-ares/*" -not -path "./gevent/gevent.*.[ch]" -not -path "./gevent/corecext.pyx" -not -path "./doc/_build/*" -not -path "./doc/mytheme/static/*" -type f | xargs egrep -l " $$"
+	! find . -not -path "*.pem" -not -path "./.eggs/*" -not -path "./src/greentest/htmlcov/*" -not -path "./src/greentest/.coverage.*" -not -path "./.tox/*" -not -path "*/__pycache__/*" -not -path "*.so" -not -path "*.pyc" -not -path "./.git/*" -not -path "./build/*"  -not -path "./src/gevent/libev/*" -not -path "./src/gevent.egg-info/*" -not -path "./dist/*" -not -path "./.DS_Store" -not -path "./deps/*" -not -path "./src/gevent/gevent.*.[ch]" -not -path "./src/gevent/corecext.pyx" -not -path "./doc/_build/*" -not -path "./doc/mytheme/static/*" -type f | xargs egrep -l " $$"
 
 prospector:
 	which prospector
 	which pylint
 # debugging
-#	pylint --rcfile=.pylintrc --init-hook="import sys, code; sys.excepthook = lambda exc, exc_type, tb: print(tb.tb_next.tb_next.tb_next.tb_next.tb_next.tb_next.tb_next.tb_next.tb_next.tb_next.tb_frame.f_locals['self'])" gevent greentest/* || true
+#	pylint --rcfile=.pylintrc --init-hook="import sys, code; sys.excepthook = lambda exc, exc_type, tb: print(tb.tb_next.tb_next.tb_next.tb_next.tb_next.tb_next.tb_next.tb_next.tb_next.tb_next.tb_frame.f_locals['self'])" gevent src/greentest/* || true
 	${PYTHON} scripts/gprospector.py -X
 
 lint: whitespace prospector
@@ -66,18 +74,18 @@ test_prelim:
 	make bench
 
 toxtest: test_prelim
-	cd greentest && GEVENT_RESOLVER=thread ${PYTHON} testrunner.py --config ../known_failures.py
+	cd src/greentest && GEVENT_RESOLVER=thread ${PYTHON} testrunner.py --config known_failures.py
 
 fulltoxtest: test_prelim
-	cd greentest && GEVENT_RESOLVER=thread ${PYTHON} testrunner.py --config ../known_failures.py
-	cd greentest && GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 ${PYTHON} testrunner.py --config ../known_failures.py --ignore tests_that_dont_use_resolver.txt
-	cd greentest && GEVENT_FILE=thread ${PYTHON} testrunner.py --config ../known_failures.py `grep -l subprocess test_*.py`
+	cd src/greentest && GEVENT_RESOLVER=thread ${PYTHON} testrunner.py --config known_failures.py
+	cd src/greentest && GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 ${PYTHON} testrunner.py --config known_failures.py --ignore tests_that_dont_use_resolver.txt
+	cd src/greentest && GEVENT_FILE=thread ${PYTHON} testrunner.py --config known_failures.py `grep -l subprocess test_*.py`
 
 leaktest:
 	GEVENTSETUP_EV_VERIFY=3 GEVENTTEST_LEAKCHECK=1 make fulltoxtest
 
 bench:
-	${PYTHON} greentest/bench_sendall.py
+	${PYTHON} src/greentest/bench_sendall.py
 
 
 travis_test_linters:
@@ -85,9 +93,9 @@ travis_test_linters:
 	GEVENTTEST_COVERAGE=1 make leaktest
 # because we set parallel=true, each run produces new and different coverage files; they all need
 # to be combined
-	coverage combine . greentest/
+	coverage combine . src/greentest/
 
-	coveralls --rcfile=greentest/.coveragerc
+	coveralls --rcfile=src/greentest/.coveragerc
 
 
 .PHONY: clean all doc prospector whitespace lint travistest travis
@@ -171,6 +179,6 @@ test-py27-cffi: $(PY27)
 	GEVENT_CORE_CFFI_ONLY=1 PYTHON=python2.7 PATH=$(BUILD_RUNTIMES)/versions/python2.7/bin:$(PATH) make develop toxtest
 
 test-py27-noembed: $(PY27)
-	cd libev && ./configure --disable-dependency-tracking && make
-	cd c-ares && ./configure --disable-dependency-tracking && make
-	CPPFLAGS="-Ilibev -Ic-ares" LDFLAGS="-Llibev/.libs -Lc-ares/.libs" LD_LIBRARY_PATH="$(PWD)/libev/.libs:$(PWD)/c-ares/.libs" EMBED=0 GEVENT_CORE_CEXT_ONLY=1 PYTHON=python2.7 PATH=$(BUILD_RUNTIMES)/versions/python2.7/bin:$(PATH) make develop toxtest
+	cd deps/libev && ./configure --disable-dependency-tracking && make
+	cd deps/c-ares && ./configure --disable-dependency-tracking && make
+	CPPFLAGS="-Ideps/libev -Ideps/c-ares" LDFLAGS="-Ldeps/libev/.libs -Ldeps/c-ares/.libs" LD_LIBRARY_PATH="$(PWD)/deps/libev/.libs:$(PWD)/deps/c-ares/.libs" EMBED=0 GEVENT_CORE_CEXT_ONLY=1 PYTHON=python2.7 PATH=$(BUILD_RUNTIMES)/versions/python2.7/bin:$(PATH) make develop toxtest

README.rst

@@ -77,8 +77,8 @@ There are a few different ways to run the tests. To simply run the
 tests on one version of Python during development, try this::
 
   python setup.py develop
-  cd greentest
-  PYTHONPATH=.. python testrunner.py --config ../known_failures.py
+  cd src/greentest
+  PYTHONPATH=.. python testrunner.py --config known_failures.py
 
 Before submitting a pull request, it's a good idea to run the tests
 across all supported versions of Python, and to check the code quality
@@ -93,8 +93,8 @@ The testrunner accepts a ``--coverage`` argument to enable code
 coverage metrics through the `coverage.py`_ package. That would go
 something like this::
 
-  cd greentest
-  PYTHONPATH=.. python testrunner.py --config ../known_failures.py --coverage
+  cd src/greentest
+  PYTHONPATH=.. python testrunner.py --config known_failures.py --coverage
   coverage combine
   coverage html -i
   <open htmlcov/index.html>

_setupares.py

+# -*- coding: utf-8 -*-
+"""
+setup helpers for c-ares.
+"""
+
+from __future__ import print_function, absolute_import, division
+
+import os
+import os.path
+import shutil
+import sys
+
+from _setuputils import Extension
+
+import distutils.sysconfig  # to get CFLAGS to pass into c-ares configure script pylint:disable=import-error
+
+from _setuputils import WIN
+from _setuputils import quoted_dep_abspath
+from _setuputils import system
+from _setuputils import make_universal_header
+from _setuputils import should_embed
+from _setuputils import LIBRARIES
+from _setuputils import DEFINE_MACROS
+from _setuputils import glob_many
+from _setuputils import dep_abspath
+
+
+CARES_EMBED = should_embed('c-ares')
+
+
+# See #616, trouble building for a 32-bit python against a 64-bit platform
+_config_vars = distutils.sysconfig.get_config_var("CFLAGS")
+if _config_vars and "m32" in _config_vars:
+    _m32 = 'CFLAGS="' + os.getenv('CFLAGS', '') + ' -m32" '
+else:
+    _m32 = ''
+
+# Use -r, not -e, for support of old solaris. See
+# https://github.com/gevent/gevent/issues/777
+ares_configure_command = ' '.join([
+    "(cd ", quoted_dep_abspath('c-ares'),
+    " && if [ -r ares_build.h ]; then cp ares_build.h ares_build.h.orig; fi ",
+    " && /bin/sh ./configure --disable-dependency-tracking " + _m32 + "CONFIG_COMMANDS= ",
+    " && cp ares_config.h ares_build.h \"$OLDPWD\" ",
+    " && mv ares_build.h.orig ares_build.h)",
+    "> configure-output.txt"])
+
+
+
+def configure_ares(bext, ext):
+    bdir = os.path.join(bext.build_temp, 'c-ares')
+    ext.include_dirs.insert(0, bdir)
+
+    if not os.path.isdir(bdir):
+        os.makedirs(bdir)
+
+    if WIN:
+        shutil.copy("deps\\c-ares\\ares_build.h.dist", os.path.join(bdir, "ares_build.h"))
+        return
+
+    cwd = os.getcwd()
+    os.chdir(bdir)
+    try:
+        if os.path.exists('ares_config.h') and os.path.exists('ares_build.h'):
+            return
+        try:
+            system(ares_configure_command)
+        except:
+            with open('configure-output.txt', 'r') as t:
+                print(t.read(), file=sys.stderr)
+            raise
+        if sys.platform == 'darwin':
+            make_universal_header('ares_build.h', 'CARES_SIZEOF_LONG')
+            make_universal_header('ares_config.h', 'SIZEOF_LONG', 'SIZEOF_SIZE_T', 'SIZEOF_TIME_T')
+    finally:
+        os.chdir(cwd)
+
+
+ARES = Extension(name='gevent.ares',
+                 sources=['src/gevent/gevent.ares.c'],
+                 include_dirs=[dep_abspath('c-ares')] if CARES_EMBED else [],
+                 libraries=list(LIBRARIES),
+                 define_macros=list(DEFINE_MACROS),
+                 depends=glob_many('src/gevent/dnshelper.c',
+                                   'src/gevent/cares_*.[ch]'))
+ARES.optional = True
+
+
+if CARES_EMBED:
+    ARES.sources += glob_many('deps/c-ares/*.c')
+    # Strip the standalone binaries that would otherwise
+    # cause linking issues
+    for bin_c in ('acountry', 'adig', 'ahost'):
+        try:
+            ARES.sources.remove('deps/c-ares/' + bin_c + '.c')
+        except ValueError:
+            pass
+    ARES.configure = configure_ares
+    if WIN:
+        ARES.libraries += ['advapi32']
+        ARES.define_macros += [('CARES_STATICLIB', '')]
+    else:
+        ARES.define_macros += [('HAVE_CONFIG_H', '')]
+        if sys.platform != 'darwin':
+            ARES.libraries += ['rt']
+    ARES.define_macros += [('CARES_EMBED', '1')]
+else:
+    ARES.libraries.append('cares')
+    ARES.define_macros += [('HAVE_NETDB_H', '')]

_setuplibev.py

+# -*- coding: utf-8 -*-
+"""
+setup helpers for libev.
+"""
+
+from __future__ import print_function, absolute_import, division
+
+import sys
+import os.path
+
+from _setuputils import Extension
+
+from _setuputils import system
+from _setuputils import quoted_dep_abspath
+from _setuputils import WIN
+from _setuputils import make_universal_header
+from _setuputils import LIBRARIES
+from _setuputils import DEFINE_MACROS
+from _setuputils import glob_many
+from _setuputils import dep_abspath
+from _setuputils import should_embed
+
+
+LIBEV_EMBED = should_embed('libev')
+
+# Configure libev in place; but cp the config.h to the old directory;
+# if we're building a CPython extension, the old directory will be
+# the build/temp.XXX/libev/ directory. If we're building from a
+# source checkout on pypy, OLDPWD will be the location of setup.py
+# and the PyPy branch will clean it up.
+libev_configure_command = ' '.join([
+    "(cd ", quoted_dep_abspath('libev'),
+    " && /bin/sh ./configure ",
+    " && cp config.h \"$OLDPWD\"",
+    ")",
+    '> configure-output.txt'
+])
+
+
+def configure_libev(bext, ext):
+    if WIN:
+        return
+
+    bdir = os.path.join(bext.build_temp, 'libev')
+    ext.include_dirs.insert(0, bdir)
+
+    if not os.path.isdir(bdir):
+        os.makedirs(bdir)
+
+    cwd = os.getcwd()
+    os.chdir(bdir)
+    try:
+        if os.path.exists('config.h'):
+            return
+        system(libev_configure_command)
+        if sys.platform == 'darwin':
+            make_universal_header('config.h',
+                                  'SIZEOF_LONG', 'SIZEOF_SIZE_T', 'SIZEOF_TIME_T')
+    finally:
+        os.chdir(cwd)
+
+CORE = Extension(name='gevent.libev.corecext',
+                 sources=['src/gevent/libev/gevent.corecext.c'],
+                 include_dirs=[dep_abspath('libev')] if LIBEV_EMBED else [],
+                 libraries=list(LIBRARIES),
+                 define_macros=list(DEFINE_MACROS),
+                 depends=glob_many('src/gevent/libev/callbacks.*',
+                                   'src/gevent/libev/stathelper.c',
+                                   'src/gevent/libev/libev*.h',
+                                   'deps/libev/*.[ch]'))
+if WIN:
+    CORE.define_macros.append(('EV_STANDALONE', '1'))
+# QQQ libev can also use -lm, however it seems to be added implicitly
+
+if LIBEV_EMBED:
+    CORE.define_macros += [('LIBEV_EMBED', '1'),
+                           ('EV_COMMON', ''),  # we don't use void* data
+                           # libev watchers that we don't use currently:
+                           ('EV_CLEANUP_ENABLE', '0'),
+                           ('EV_EMBED_ENABLE', '0'),
+                           ("EV_PERIODIC_ENABLE", '0')]
+    CORE.configure = configure_libev
+    if sys.platform == "darwin":
+        os.environ["CPPFLAGS"] = ("%s %s" % (os.environ.get("CPPFLAGS", ""), "-U__llvm__")).lstrip()
+    if os.environ.get('GEVENTSETUP_EV_VERIFY') is not None:
+        CORE.define_macros.append(('EV_VERIFY', os.environ['GEVENTSETUP_EV_VERIFY']))
+else:
+    CORE.libraries.append('ev')

_setuputils.py

+# -*- coding: utf-8 -*-
+"""
+gevent build utilities.
+
+.. $Id$
+"""
+
+from __future__ import print_function, absolute_import, division
+
+import re
+import os
+import os.path
+import sys
+from subprocess import check_call
+from glob import glob
+
+from setuptools.command.build_ext import build_ext
+from setuptools.command.sdist import sdist
+
+## Exported configurations
+
+PYPY = hasattr(sys, 'pypy_version_info')
+WIN = sys.platform.startswith('win')
+CFFI_WIN_BUILD_ANYWAY = os.environ.get("PYPY_WIN_BUILD_ANYWAY")
+
+LIBRARIES = []
+DEFINE_MACROS = []
+
+
+if WIN:
+    LIBRARIES += ['ws2_32']
+    DEFINE_MACROS += [('FD_SETSIZE', '1024'), ('_WIN32', '1')]
+
+### File handling
+
+THIS_DIR = os.path.dirname(__file__)
+
+def quoted_abspath(*segments):
+    return '"' + os.path.abspath(os.path.join(*segments)) + '"'
+
+def read(name, *args):
+    """Read a file path relative to this file."""
+    with open(os.path.join(THIS_DIR, name)) as f:
+        return f.read(*args)
+
+def read_version(name="src/gevent/__init__.py"):
+    contents = read(name)
+    version = re.search(r"__version__\s*=\s*'(.*)'", contents, re.M).group(1)
+    assert version, "could not read version"
+    return version
+
+def dep_abspath(depname, *extra):
+    return os.path.abspath(os.path.join('deps', depname, *extra))
+
+def quoted_dep_abspath(depname):
+    return quoted_abspath(dep_abspath(depname))
+
+def glob_many(*globs):
+    """
+    Return a list of all the glob patterns expanded.
+    """
+    result = []
+    for pattern in globs:
+        result.extend(glob(pattern))
+    return sorted(result)
+
+
+## Configuration
+
+def _parse_environ(key):
+    value = os.environ.get(key)
+    if not value:
+        return
+    value = value.lower().strip()
+    if value in ('1', 'true', 'on', 'yes'):
+        return True
+    elif value in ('0', 'false', 'off', 'no'):
+        return False
+    raise ValueError('Environment variable %r has invalid value %r. '
+                     'Please set it to 1, 0 or an empty string' % (key, value))
+
+IGNORE_CFFI = _parse_environ("GEVENT_NO_CFFI_BUILD")
+
+def _get_config_value(key, defkey, path=None):
+    """
+    Find a boolean value, configured in the environment at *key* or
+    *defkey* (typically, *defkey* will be shared by several calls). If
+    those don't exist, then check for the existence of *path* and return
+    that (if path is given)
+    """
+    value = _parse_environ(key)
+    if value is None:
+        value = _parse_environ(defkey)
+    if value is not None:
+        return value
+    return os.path.exists(path) if path is not None else False
+
+def should_embed(dep_name):
+    """
+    Check the configuration for the dep_name and see if it
+    should be embedded. Environment keys are derived from the
+    dep name: libev becomes LIBEV_EMBED and c-ares becomes CARES_EMBED.
+    """
+    path = dep_abspath(dep_name)
+    defkey = 'EMBED'
+    key = dep_name.replace('-', '').upper() + '_' + defkey
+
+    return _get_config_value(key, defkey, path)
+
+## Headers
+
+def make_universal_header(filename, *defines):
+    defines = [('#define %s ' % define, define) for define in defines]
+    with open(filename, 'r') as f:
+        lines = f.read().split('\n')
+    ifdef = 0
+    with open(filename, 'w') as f:
+        for line in lines:
+            if line.startswith('#ifdef'):
+                ifdef += 1
+            elif line.startswith('#endif'):
+                ifdef -= 1
+            elif not ifdef:
+                for prefix, define in defines:
+                    if line.startswith(prefix):
+                        line = '#ifdef __LP64__\n#define %s 8\n#else\n#define %s 4\n#endif' % (define, define)
+                        break
+            print(line, file=f)
+
+# Processes
+
+
+def _system(cmd):
+    sys.stdout.write('Running %r in %s\n' % (cmd, os.getcwd()))
+    return check_call(cmd, shell=True)
+
+
+def system(cmd):
+    if _system(cmd):
+        sys.exit(1)
+
+
+## Distutils extensions
+class BuildFailed(Exception):
+    pass
+
+from distutils.errors import CCompilerError, DistutilsExecError, DistutilsPlatformError # pylint:disable=no-name-in-module,import-error
+ext_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError, IOError)
+
+
+class ConfiguringBuildExt(build_ext):
+
+    def gevent_prepare(self, ext):
+        configure = getattr(ext, 'configure', None)
+        if configure:
+            configure(self, ext)
+
+    def build_extension(self, ext):
+        self.gevent_prepare(ext)
+        try:
+            result = build_ext.build_extension(self, ext)
+        except ext_errors:
+            if getattr(ext, 'optional', False):
+                raise BuildFailed()
+            else:
+                raise
+        return result
+
+
+class MakeSdist(sdist):
+    """
+    An sdist that runs make if needed, and makes sure
+    that the Makefile doesn't make it into the dist
+    archive.
+    """
+
+    _ran_make = False
+
+    @classmethod
+    def make(cls, targets=''):
+        # NOTE: We have two copies of the makefile, one
+        # for posix, one for windows. Our sdist command takes
+        # care of renaming the posix one so it doesn't get into
+        # the .tar.gz file (we don't want to re-run make in a released
+        # file). We trigger off the presence/absence of that file altogether
+        # to skip both posix and unix branches.
+        # See https://github.com/gevent/gevent/issues/757
+        if cls._ran_make:
+            return
+
+        if os.path.exists('Makefile'):
+            if WIN:
+                # make.cmd handles checking for PyPy and only making the
+                # right things, so we can ignore the targets
+                system("appveyor\\make.cmd")
+            else:
+                if "PYTHON" not in os.environ:
+                    os.environ["PYTHON"] = sys.executable
+                system('make ' + targets)
+        cls._ran_make = True
+
+    def run(self):
+        renamed = False
+        if os.path.exists('Makefile'):
+            self.make()
+            os.rename('Makefile', 'Makefile.ext')
+            renamed = True
+        try:
+            return sdist.run(self)
+        finally:
+            if renamed:
+                os.rename('Makefile.ext', 'Makefile')
+
+
+from setuptools import Extension as _Extension
+
+class Extension(_Extension):
+    # This class exists currently mostly to make pylint
+    # happy in terms of attributes we use.
+
+    def __init__(self, *args, **kwargs):
+        self.libraries = []
+        self.define_macros = []
+        # Python 2 has this as an old-style class for some reason
+        # so super() doesn't work.
+        _Extension.__init__(self, *args, **kwargs) # pylint:disable=no-member,non-parent-init-called

appveyor.yml

@@ -145,7 +145,7 @@ build_script:
 
 test_script:
   # Run the project tests
-  - "cd greentest && %PYEXE% testrunner.py --config ../known_failures.py && cd .."
+  - "cd src/greentest && %PYEXE% testrunner.py --config known_failures.py && cd ../.."
 
 after_test:
   # We already built the wheel during build_script, because it's

appveyor/make.cmd

 IF "%PYTHON_EXE%" == "python" (
-    %PYEXE% util\cythonpp.py -o gevent.corecext.c gevent\corecext.ppyx
-	type gevent\callbacks.c >> gevent.corecext.c
-    move gevent.corecext.* gevent
+    %PYEXE% util\cythonpp.py -o gevent.corecext.c --module-name gevent.libev.corecext.pyx src\gevent\libev\corecext.ppyx
+	type src\gevent\libev\callbacks.c >> gevent.corecext.c
+    move gevent.corecext.* src\gevent\libev
 )
-cython -o gevent.ares.c gevent\ares.pyx
-move gevent.ares.* gevent
-cython -o gevent._semaphore.c gevent\_semaphore.py
-move gevent._semaphore.* gevent
+cython -o gevent.ares.c src\gevent\ares.pyx
+move gevent.ares.* src\gevent
+cython -o gevent._semaphore.c src\gevent\_semaphore.py
+move gevent._semaphore.* src\gevent

changelog.rst

@@ -12,6 +12,9 @@ Incompatible Changes
 - Support for Python 2.6 has been removed. See :pr:`766`.
 - Remove module ``gevent.coros`` which was replaced by ``gevent.lock``
   and has been deprecated since 1.0b2.
+- The internal implementation modules ``gevent.corecext`` and
+  ``gevent.corecffi`` have been moved. Please import from
+  ``gevent.core`` instead.
 
 Libraries
 ---------
@@ -29,6 +32,8 @@ Libraries
   attempted at every import. This could lead to scattered "gevent"
   directories and undependable results.
 - Update Cython to 0.24.
+- setuptools is now required at build time on all platforms.
+  Previously it was only required for Windows and PyPy.
 
 
 Security