Skip to content

Commit b09847a

Browse files
committed
we can use Cython 0.25 without modification now
1 parent 19baa92 commit b09847a

File tree

4 files changed

+3
-292
lines changed

4 files changed

+3
-292
lines changed

test/extra/lxml_test.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ def install_and_test_lxml():
1313
os.makedirs(SRC_DIR)
1414

1515
url = "https://github.com/cython/cython"
16-
subprocess.check_call(["git", "clone", "--depth", "1", "--branch", "0.24", url], cwd=SRC_DIR)
17-
18-
PATCH_FILE = os.path.abspath(os.path.join(os.path.dirname(__file__), "../integration/Cython-0.24.patch"))
19-
subprocess.check_call(["patch", "-p1", "--input=" + PATCH_FILE], cwd=CYTHON_DIR)
20-
print ">>> Applied Cython patch"
16+
subprocess.check_call(["git", "clone", "--depth", "1", "--branch", "0.25a0", url], cwd=SRC_DIR)
2117

2218
subprocess.check_call([PYTHON_EXE, "setup.py", "install"], cwd=CYTHON_DIR)
2319
subprocess.check_call([PYTHON_EXE, "-c", "import Cython"], cwd=CYTHON_DIR)

test/extra/numpy_fulltest.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,7 @@ def print_progress_header(text):
2929
if not os.path.exists(CYTHON_DIR):
3030

3131
url = "https://github.com/cython/cython"
32-
subprocess.check_call(["git", "clone", "--depth", "1", "--branch", "0.24", url], cwd=SRC_DIR)
33-
34-
if USE_CUSTOM_PATCHES:
35-
PATCH_FILE = os.path.abspath(os.path.join(os.path.dirname(__file__), "../integration/Cython-0.24.patch"))
36-
subprocess.check_call(["patch", "-p1", "--input=" + PATCH_FILE], cwd=CYTHON_DIR)
37-
print ">>> Applied Cython patch"
38-
32+
subprocess.check_call(["git", "clone", "--depth", "1", "--branch", "0.25a0", url], cwd=SRC_DIR)
3933

4034
try:
4135
subprocess.check_call([PYTHON_EXE, "setup.py", "install"], cwd=CYTHON_DIR)

test/integration/Cython-0.24.patch

Lines changed: 0 additions & 274 deletions
This file was deleted.

test/integration/scipy_test.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,7 @@ def print_progress_header(text):
6464
if not os.path.exists(CYTHON_DIR):
6565

6666
url = "https://github.com/cython/cython"
67-
subprocess.check_call(["git", "clone", "--depth", "1", "--branch", "0.24", url], cwd=SRC_DIR)
68-
69-
if USE_CUSTOM_PATCHES:
70-
PATCH_FILE = os.path.abspath(os.path.join(os.path.dirname(__file__), "Cython-0.24.patch"))
71-
subprocess.check_call(["patch", "-p1", "--input=" + PATCH_FILE], cwd=CYTHON_DIR)
72-
print ">>> Applied Cython patch"
67+
subprocess.check_call(["git", "clone", "--depth", "1", "--branch", "0.25a0", url], cwd=SRC_DIR)
7368

7469
try:
7570
subprocess.check_call([PYTHON_EXE, "setup.py", "install"], cwd=CYTHON_DIR)

0 commit comments

Comments
 (0)