paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

setup_venv: Remove CentOS workaround for fixed pycurl bug.

Browse Source 
We are installing pycurl 7.43.0.3 which includes the fix.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg
2019-08-29 15:44:32 -07:00
committed by Tim Abbott
parent d312d04510
commit 875002108f
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/lib/setup_venv.py
View File

@@ -320,22 +320,6 @@ def do_setup_virtualenv(venv_path, requirements_file, virtualenv_args):
print("Configuring pip to use custom CA certificates...") print("Configuring pip to use custom CA certificates...")
add_cert_to_pipconf() add_cert_to_pipconf()
# CentOS-specific hack/workaround
# Install pycurl with custom flag due to this error when installing
# via pip:
# __main__.ConfigurationError: Curl is configured to use SSL, but
# we have not been able to determine which SSL backend it is using.
# Please see PycURL documentation for how to specify the SSL
# backend manually.
# See https://github.com/pycurl/pycurl/issues/526
# The fix exists on pycurl master, but not yet in any release
# We can likely remove this when pycurl > 7.43.0.2 comes out.
if os.path.exists("/etc/redhat-release"):
pycurl_env = os.environ.copy()
pycurl_env["PYCURL_SSL_LIBRARY"] = "nss"
run([pip, "install", "pycurl==7.43.0.2", "--compile", "--no-cache-dir"],
env=pycurl_env)
try: try:
install_venv_deps(pip, requirements_file) install_venv_deps(pip, requirements_file)
except subprocess.CalledProcessError: except subprocess.CalledProcessError: