Commit f7734650 authored by Marius Wachtler's avatar Marius Wachtler Committed by GitHub

Merge pull request #1248 from undingen/cython_url

download cython from github instead of cython.org
parents b21fad57 01b0367c
...@@ -11,11 +11,11 @@ def install_and_test_lxml(): ...@@ -11,11 +11,11 @@ def install_and_test_lxml():
shutil.rmtree(SRC_DIR, ignore_errors=True) shutil.rmtree(SRC_DIR, ignore_errors=True)
os.makedirs(SRC_DIR) os.makedirs(SRC_DIR)
url = "http://cython.org/release/Cython-0.22.tar.gz" url = "https://github.com/cython/cython/archive/0.22.tar.gz"
subprocess.check_call(["wget", url], cwd=SRC_DIR) subprocess.check_call(["wget", url, "-O", "Cython-0.22.tar.gz"], cwd=SRC_DIR)
subprocess.check_call(["tar", "-zxf", "Cython-0.22.tar.gz"], cwd=SRC_DIR) subprocess.check_call(["tar", "-zxf", "Cython-0.22.tar.gz"], cwd=SRC_DIR)
CYTHON_DIR = os.path.abspath(os.path.join(SRC_DIR, "Cython-0.22")) CYTHON_DIR = os.path.abspath(os.path.join(SRC_DIR, "cython-0.22"))
PATCH_FILE = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "integration", "Cython-0.22.patch")) PATCH_FILE = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "integration", "Cython-0.22.patch"))
subprocess.check_call(["patch", "-p1", "--input=" + PATCH_FILE], cwd=CYTHON_DIR) subprocess.check_call(["patch", "-p1", "--input=" + PATCH_FILE], cwd=CYTHON_DIR)
print "Applied Cython patch" print "Applied Cython patch"
......
...@@ -22,14 +22,14 @@ test_helper.create_virtenv(ENV_NAME, DEPENDENCIES) ...@@ -22,14 +22,14 @@ test_helper.create_virtenv(ENV_NAME, DEPENDENCIES)
SRC_DIR = ENV_NAME SRC_DIR = ENV_NAME
ENV_DIR = os.path.abspath(ENV_NAME) ENV_DIR = os.path.abspath(ENV_NAME)
PYTHON_EXE = os.path.abspath(ENV_NAME + "/bin/python") PYTHON_EXE = os.path.abspath(ENV_NAME + "/bin/python")
CYTHON_DIR = os.path.abspath(os.path.join(SRC_DIR, "Cython-0.22")) CYTHON_DIR = os.path.abspath(os.path.join(SRC_DIR, "cython-0.22"))
NUMPY_DIR = os.path.abspath(os.path.join(SRC_DIR, "numpy")) NUMPY_DIR = os.path.abspath(os.path.join(SRC_DIR, "numpy"))
print_progress_header("Setting up Cython...") print_progress_header("Setting up Cython...")
if not os.path.exists(CYTHON_DIR): if not os.path.exists(CYTHON_DIR):
url = "http://cython.org/release/Cython-0.22.tar.gz" url = "https://github.com/cython/cython/archive/0.22.tar.gz"
subprocess.check_call(["wget", url], cwd=SRC_DIR) subprocess.check_call(["wget", url, "-O", "Cython-0.22.tar.gz"], cwd=SRC_DIR)
subprocess.check_call(["tar", "-zxf", "Cython-0.22.tar.gz"], cwd=SRC_DIR) subprocess.check_call(["tar", "-zxf", "Cython-0.22.tar.gz"], cwd=SRC_DIR)
if USE_CUSTOM_PATCHES: if USE_CUSTOM_PATCHES:
......
...@@ -62,14 +62,14 @@ if not os.path.exists(ENV_NAME) or os.stat(sys.executable).st_mtime > os.stat(EN ...@@ -62,14 +62,14 @@ if not os.path.exists(ENV_NAME) or os.stat(sys.executable).st_mtime > os.stat(EN
SRC_DIR = ENV_NAME SRC_DIR = ENV_NAME
PYTHON_EXE = os.path.abspath(ENV_NAME + "/bin/python") PYTHON_EXE = os.path.abspath(ENV_NAME + "/bin/python")
CYTHON_DIR = os.path.abspath(os.path.join(SRC_DIR, "Cython-0.22")) CYTHON_DIR = os.path.abspath(os.path.join(SRC_DIR, "cython-0.22"))
NUMPY_DIR = os.path.abspath(os.path.join(SRC_DIR, "numpy")) NUMPY_DIR = os.path.abspath(os.path.join(SRC_DIR, "numpy"))
print_progress_header("Setting up Cython...") print_progress_header("Setting up Cython...")
if not os.path.exists(CYTHON_DIR): if not os.path.exists(CYTHON_DIR):
url = "http://cython.org/release/Cython-0.22.tar.gz" url = "https://github.com/cython/cython/archive/0.22.tar.gz"
subprocess.check_call(["wget", url], cwd=SRC_DIR) subprocess.check_call(["wget", url, "-O", "Cython-0.22.tar.gz"], cwd=SRC_DIR)
subprocess.check_call(["tar", "-zxf", "Cython-0.22.tar.gz"], cwd=SRC_DIR) subprocess.check_call(["tar", "-zxf", "Cython-0.22.tar.gz"], cwd=SRC_DIR)
if USE_CUSTOM_PATCHES: if USE_CUSTOM_PATCHES:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment