[yt-svn] commit/yt: 3 new changesets

[commits-noreply at bitbucket.org]

3 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/155e080e6583/
Changeset:   155e080e6583
Branch:      yt
User:        xarthisius
Date:        2015-07-02 17:00:38+00:00
Summary:     Make sure that setup.py cython's version check matches install_script.sh
Affected #:  1 file

diff -r 4d383ff42e245a683b65a87e648cc7276e927a04 -r 155e080e6583ff1e11863b368f3c7027c98a70e2 setup.py
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,6 @@
 import os
 import os.path
+import re
 import glob
 import sys
 import time
@@ -49,19 +50,22 @@
     REASON_FILES.append((dir_name, files))
 
 # Verify that we have Cython installed
+with open(os.path.join("doc", "install_script.sh"), 'r') as fh:
+    cython_ver_regex = re.compile("^CYTHON='Cython-(\d+.\d+)'$")
+    REQ_CYTHON = \
+        [f.groups()[0] for f in map(cython_ver_regex.search,
+                                    fh.readlines()) if f][0]
 try:
     import Cython
-    if version.LooseVersion(Cython.__version__) < version.LooseVersion('0.16'):
-        needs_cython = True
-    else:
-        needs_cython = False
+    needs_cython = \
+        version.LooseVersion(Cython.__version__) < version.LooseVersion(REQ_CYTHON)
 except ImportError as e:
     needs_cython = True
 
 if needs_cython:
     print("Cython is a build-time requirement for the source tree of yt.")
     print("Please either install yt from a provided, release tarball,")
-    print("or install Cython (version 0.16 or higher).")
+    print("or install Cython (version %s or higher)." % REQ_CYTHON)
     print("You may be able to accomplish this by typing:")
     print("     pip install -U Cython")
     sys.exit(1)


https://bitbucket.org/yt_analysis/yt/commits/0441137b0fd4/
Changeset:   0441137b0fd4
Branch:      yt
User:        xarthisius
Date:        2015-07-09 22:47:51+00:00
Summary:     Hardcode minimum version of Cython in setup.py
Affected #:  1 file

diff -r 155e080e6583ff1e11863b368f3c7027c98a70e2 -r 0441137b0fd4cd75f534f3e1cc76015ffe55e67e setup.py
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,5 @@
 import os
 import os.path
-import re
 import glob
 import sys
 import time
@@ -50,11 +49,7 @@
     REASON_FILES.append((dir_name, files))
 
 # Verify that we have Cython installed
-with open(os.path.join("doc", "install_script.sh"), 'r') as fh:
-    cython_ver_regex = re.compile("^CYTHON='Cython-(\d+.\d+)'$")
-    REQ_CYTHON = \
-        [f.groups()[0] for f in map(cython_ver_regex.search,
-                                    fh.readlines()) if f][0]
+REQ_CYTHON = '0.22'
 try:
     import Cython
     needs_cython = \


https://bitbucket.org/yt_analysis/yt/commits/7d4877bae33a/
Changeset:   7d4877bae33a
Branch:      yt
User:        ngoldbaum
Date:        2015-07-10 00:03:28+00:00
Summary:     Merged in xarthisius/yt (pull request #1626)

Bump cython's version check
Affected #:  1 file

diff -r 98c8bdfbc1e00d4ee2388663a7f4072bbf98fc57 -r 7d4877bae33a4739b0f46c78a11eac5b7db711c1 setup.py
--- a/setup.py
+++ b/setup.py
@@ -49,19 +49,18 @@
     REASON_FILES.append((dir_name, files))
 
 # Verify that we have Cython installed
+REQ_CYTHON = '0.22'
 try:
     import Cython
-    if version.LooseVersion(Cython.__version__) < version.LooseVersion('0.16'):
-        needs_cython = True
-    else:
-        needs_cython = False
+    needs_cython = \
+        version.LooseVersion(Cython.__version__) < version.LooseVersion(REQ_CYTHON)
 except ImportError as e:
     needs_cython = True
 
 if needs_cython:
     print("Cython is a build-time requirement for the source tree of yt.")
     print("Please either install yt from a provided, release tarball,")
-    print("or install Cython (version 0.16 or higher).")
+    print("or install Cython (version %s or higher)." % REQ_CYTHON)
     print("You may be able to accomplish this by typing:")
     print("     pip install -U Cython")
     sys.exit(1)

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.