Also skip the 'make' step on Windows if installing from an sdist (piggyback...

Also skip the 'make' step on Windows if installing from an sdist (piggyback the Unix method of looking for Makefile/Makefile.ext). Ref #757.

README.rst

@@ -39,11 +39,6 @@ To install one of these release candidates, you can run::
 
     pip install --pre gevent
 
-.. tip::  On Windows, if you install from the sdist instead of a
-          binary wheel, you will need to have ``cython`` installed
-          *before* you attempt to install gevent. Most users will
-          use the binary wheel and can ignore this.
-
 .. tip:: On Windows, you need Pip 8.0 or later to install the binary wheel.
 
 Download the latest release from `Python Package Index`_ or clone `the repository`_.

changelog.rst

@@ -26,6 +26,10 @@
 - Using a :class:`~logging.Logger` as a :mod:`pywsgi` error or request
   log stream no longer produces extra newlines. Reported in
   :issue:`756` by ael-code.
+- Windows: Installing from an sdist (.tar.gz) on PyPI no longer
+  requires having Cython installed first. (Note that the binary installation
+  formats (wheels, exes, msis) are preferred on Windows.) Reported in
+  :issue:`757` by Ned Batchelder.
 
 .. _bug 13502: http://bugs.python.org/issue13502
 

doc/intro.rst

@@ -55,12 +55,6 @@ addition to the Cython backend on CPython.
 
 .. tip:: On Windows, you need Pip 8.0 or later to install the binary wheels.
 
-.. tip::  On Windows, if you install from the PyPI sdist instead of a
-          binary wheel, you will need to have ``cython`` installed
-          *before* you attempt to install gevent. (Cython is always
-          required when working from a source checkout.) Most users will
-          use the binary wheel and can ignore this.
-
 Development instructions can be found `on PyPI <https://pypi.python.org/pypi/gevent#development>`_.
 
 __ http://pypi.python.org/pypi/greenlet

setup.py

@@ -259,14 +259,19 @@ _ran_make = []
 
 def make(targets=''):
     # NOTE: We have two copies of the makefile, one
-    # for posix, one for windows
+    # 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 not _ran_make:
-        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 os.path.exists('Makefile'):
+        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)
@@ -442,9 +447,6 @@ else:
 if run_make and os.path.exists("Makefile"):
     # The 'sdist' command renames our makefile after it
     # runs so we don't try to use it from a release tarball.
-    # XXX: FIXME: This doesn't work correctly on win32
-    # because we don't rename the appveyor\\make.cmd script.
-    # See https://github.com/gevent/gevent/issues/757.
 
     # NOTE: This is effectively pointless and serves only for
     # documentation/metadata, because we run 'make' *before* we run