we can use Cython 0.25 without modification now

pyston · Sep 26, 2016 · b09847a · b09847a
1 parent 19baa92
commit b09847a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 292 deletions.
diff --git a/test/extra/lxml_test.py b/test/extra/lxml_test.py
@@ -13,11 +13,7 @@ def install_and_test_lxml():
     os.makedirs(SRC_DIR)
 
     url = "https://github.com/cython/cython"
-    subprocess.check_call(["git", "clone", "--depth", "1", "--branch", "0.24", url], cwd=SRC_DIR)
-
-    PATCH_FILE = os.path.abspath(os.path.join(os.path.dirname(__file__), "../integration/Cython-0.24.patch"))
-    subprocess.check_call(["patch", "-p1", "--input=" + PATCH_FILE], cwd=CYTHON_DIR)
-    print ">>> Applied Cython patch"
+    subprocess.check_call(["git", "clone", "--depth", "1", "--branch", "0.25a0", url], cwd=SRC_DIR)
 
     subprocess.check_call([PYTHON_EXE, "setup.py", "install"], cwd=CYTHON_DIR)
     subprocess.check_call([PYTHON_EXE, "-c", "import Cython"], cwd=CYTHON_DIR)

diff --git a/test/extra/numpy_fulltest.py b/test/extra/numpy_fulltest.py
@@ -29,13 +29,7 @@ def print_progress_header(text):
 if not os.path.exists(CYTHON_DIR):
 
     url = "https://github.com/cython/cython"
-    subprocess.check_call(["git", "clone", "--depth", "1", "--branch", "0.24", url], cwd=SRC_DIR)
-
-    if USE_CUSTOM_PATCHES:
-        PATCH_FILE = os.path.abspath(os.path.join(os.path.dirname(__file__), "../integration/Cython-0.24.patch"))
-        subprocess.check_call(["patch", "-p1", "--input=" + PATCH_FILE], cwd=CYTHON_DIR)
-        print ">>> Applied Cython patch"
-
+    subprocess.check_call(["git", "clone", "--depth", "1", "--branch", "0.25a0", url], cwd=SRC_DIR)
 
     try:
         subprocess.check_call([PYTHON_EXE, "setup.py", "install"], cwd=CYTHON_DIR)

diff --git a/test/integration/Cython-0.24.patch b/test/integration/Cython-0.24.patch
diff --git a/test/integration/scipy_test.py b/test/integration/scipy_test.py
@@ -64,12 +64,7 @@ def print_progress_header(text):
 if not os.path.exists(CYTHON_DIR):
 
     url = "https://github.com/cython/cython"
-    subprocess.check_call(["git", "clone", "--depth", "1", "--branch", "0.24", url], cwd=SRC_DIR)
-
-    if USE_CUSTOM_PATCHES:
-        PATCH_FILE = os.path.abspath(os.path.join(os.path.dirname(__file__), "Cython-0.24.patch"))
-        subprocess.check_call(["patch", "-p1", "--input=" + PATCH_FILE], cwd=CYTHON_DIR)
-        print ">>> Applied Cython patch"
+    subprocess.check_call(["git", "clone", "--depth", "1", "--branch", "0.25a0", url], cwd=SRC_DIR)
 
     try:
         subprocess.check_call([PYTHON_EXE, "setup.py", "install"], cwd=CYTHON_DIR)