From c42077c12fa1efa4a347636b4280466b41ea0f0c Mon Sep 17 00:00:00 2001 From: Mateusz Mandera Date: Thu, 19 Sep 2019 22:31:52 +0200 Subject: [PATCH] dependencies: Add dependencies needed for SAML. --- requirements/common.in | 3 +++ requirements/dev.txt | 4 ++++ requirements/prod.txt | 4 ++++ scripts/lib/setup_venv.py | 13 +++++++++++-- version.py | 2 +- 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/requirements/common.in b/requirements/common.in index 78ec78f840..41cece8bf9 100644 --- a/requirements/common.in +++ b/requirements/common.in @@ -173,3 +173,6 @@ pyahocorasick # Needed for function decorators that don't break introspection. # Used for rate limiting authentication. decorator + +# Needed for SAML authentication. +python3-saml diff --git a/requirements/dev.txt b/requirements/dev.txt index 991fe86b74..670290f072 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -73,6 +73,7 @@ imagesize==1.1.0 # via sphinx incremental==17.5.0 # via twisted ipython-genutils==0.2.0 # via traitlets ipython==7.8.0 +isodate==0.6.0 # via python3-saml isort==4.3.21 jedi==0.15.1 # via ipython jinja2==2.10.1 @@ -103,6 +104,7 @@ pickleshare==0.7.5 # via ipython pika==0.13.1 pillow==6.1.0 pip-tools==4.1.0 +pkgconfig==1.5.1 # via xmlsec polib==1.1.0 premailer==3.6.1 prompt-toolkit==2.0.9 # via ipython @@ -136,6 +138,7 @@ python-magic==0.4.15 python-slugify==1.2.6 # via transifex-client python-twitter==3.5 python3-openid==3.1.0 # via social-auth-core +python3-saml==1.8.0 pytz==2019.2 pyyaml==5.1.2 # via cfn-lint, moto, yamole qrcode==6.1 # via django-two-factor-auth @@ -189,6 +192,7 @@ wcwidth==0.1.7 # via prompt-toolkit websocket-client==0.56.0 # via docker werkzeug==0.16.0 # via moto wrapt==1.11.2 # via aws-xray-sdk +xmlsec==1.3.3 # via python3-saml xmltodict==0.12.0 # via moto yamole==2.1.6 zope.interface==4.6.0 # via datetime, twisted diff --git a/requirements/prod.txt b/requirements/prod.txt index 86ce5da6b7..33789a1f94 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -51,6 +51,7 @@ idna==2.8 # via hyperlink, requests ijson==2.5 ipython-genutils==0.2.0 # via traitlets ipython==7.8.0 +isodate==0.6.0 # via python3-saml jedi==0.15.1 # via ipython jinja2==2.10.1 git+https://github.com/zulip/libthumbor.git@60ed2431c07686a12f2770b2d852c5650f3ccfc6#egg=libthumbor==1.3.2zulip @@ -67,6 +68,7 @@ phonenumberslite==8.10.19 pickleshare==0.7.5 # via ipython pika==0.13.1 pillow==6.1.0 +pkgconfig==1.5.1 # via xmlsec polib==1.1.0 premailer==3.6.1 prompt-toolkit==2.0.9 # via ipython @@ -89,6 +91,7 @@ python-ldap==3.2.0 # via django-auth-ldap python-magic==0.4.15 python-twitter==3.5 python3-openid==3.1.0 # via social-auth-core +python3-saml==1.8.0 pytz==2019.2 pyyaml==5.1.2 # via yamole qrcode==6.1 # via django-two-factor-auth @@ -115,6 +118,7 @@ urllib3==1.25.5 # via requests uwsgi==2.0.18 virtualenv-clone==0.5.3 wcwidth==0.1.7 # via prompt-toolkit +xmlsec==1.3.3 # via python3-saml yamole==2.1.6 git+https://github.com/zulip/python-zulip-api.git@804501610b6a205334e71b4e441fca60acf650da#egg=zulip==0.6.1_git&subdirectory=zulip git+https://github.com/zulip/python-zulip-api.git@804501610b6a205334e71b4e441fca60acf650da#egg=zulip_bots==0.6.1+git&subdirectory=zulip_bots diff --git a/scripts/lib/setup_venv.py b/scripts/lib/setup_venv.py index 2a277ecccc..c2470131d0 100644 --- a/scripts/lib/setup_venv.py +++ b/scripts/lib/setup_venv.py @@ -29,11 +29,14 @@ VENV_DEPENDENCIES = [ "virtualenv", "python3-six", "python-six", - "libxml2-dev", # Used for installing talon + "libxml2-dev", # Used for installing talon and python-xmlsec "libxslt1-dev", # Used for installing talon "libpq-dev", # Needed by psycopg2 "libssl-dev", # Needed to build pycurl and other libraries "libmagic1", # Used for install python-magic + # Needed by python-xmlsec: + "libxmlsec1-dev", + "libxmlsec1-openssl", # This is technically a node dependency, but we add it here # because we don't have another place that we install apt packages @@ -52,7 +55,14 @@ COMMON_YUM_VENV_DEPENDENCIES = [ "python-devel", "python2-pip", "python-six", + # Needed by python-xmlsec: + "gcc" + "python3-devel", "libxml2-devel", + "xmlsec1-devel", + "xmlsec1-openssl-devel", + "libtool-ltdl-devel", + "libxslt-devel", "postgresql-libs", # libpq-dev on apt "openssl-devel", @@ -66,7 +76,6 @@ REDHAT_VENV_DEPENDENCIES = COMMON_YUM_VENV_DEPENDENCIES + [ ] FEDORA_VENV_DEPENDENCIES = COMMON_YUM_VENV_DEPENDENCIES + [ - "python3-devel", "python3-pip", "python3-six", "virtualenv", # see https://unix.stackexchange.com/questions/27877/install-virtualenv-on-fedora-16 diff --git a/version.py b/version.py index 396690ef99..b193d30e1c 100644 --- a/version.py +++ b/version.py @@ -26,4 +26,4 @@ LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2019/03/01/zulip-2-0-relea # historical commits sharing the same major version, in which case a # minor version bump suffices. -PROVISION_VERSION = '56.1' +PROVISION_VERSION = '56.2'