Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

requirements: Remove django-pipeline. 

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg 2019-07-18 02:37:05 -07:00 committed by Tim Abbott
parent 2b33822de9
commit 6d5a20ac62
8 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/zulip/manifests/static_asset_compiler.pp
View File

@ -3,14 +3,12 @@ class zulip::static_asset_compiler {
case $::osfamily {
'debian': {
$static_asset_compiler_packages = [
'yui-compressor',
# Used by makemessages i18n
'gettext',
]
}
'redhat': {
$static_asset_compiler_packages = [
'yuicompressor',
'gettext',
]
}

3
requirements/common.in
View File

@ -106,9 +106,6 @@ tornado==4.5.3
# Fast JSON parser
-e git+https://github.com/zulip/ultrajson@70ac02bec#egg=ujson==1.35+git
# Django extension for static asset pipeline
django-pipeline==1.6.14
# Django extension for serving webpack modules
django-webpack-loader==0.6.0

1
requirements/dev.txt
View File

@ -49,7 +49,6 @@ django-bitfield==1.9.5
django-formtools==2.1 # via django-two-factor-auth
django-otp==0.6.0 # via django-two-factor-auth
django-phonenumber-field==1.3.0 # via django-two-factor-auth
django-pipeline==1.6.14
django-pylibmc==0.6.1
django-sendfile==0.3.11
django-statsd-mozilla==0.4.0

1
requirements/prod.txt
View File

@ -38,7 +38,6 @@ django-bitfield==1.9.5
django-formtools==2.1 # via django-two-factor-auth
django-otp==0.6.0 # via django-two-factor-auth
django-phonenumber-field==1.3.0 # via django-two-factor-auth
django-pipeline==1.6.14
django-pylibmc==0.6.1
django-sendfile==0.3.11
django-statsd-mozilla==0.4.0

2
tools/circleci/Dockerfile.template
View File

@ -90,7 +90,7 @@ RUN DOCKERIZE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cac
RUN apt-get update \
&& apt-get install --no-install-recommends \
memcached rabbitmq-server redis-server \
hunspell-en-us supervisor libssl-dev yui-compressor puppet \
hunspell-en-us supervisor libssl-dev puppet \
gettext libffi-dev libfreetype6-dev zlib1g-dev libjpeg-dev \
libldap2-dev libmemcached-dev python-dev python-pip \
python-six libxml2-dev libxslt1-dev libpq-dev \

2
tools/lib/provision.py
View File

@ -151,7 +151,6 @@ COMMON_DEPENDENCIES = [
UBUNTU_COMMON_APT_DEPENDENCIES = COMMON_DEPENDENCIES + [
"redis-server",
"hunspell-en-us",
"yui-compressor",
"puppet-lint",
"netcat", # Used for flushing memcached
"libfontconfig1", # Required by phantomjs
@ -160,7 +159,6 @@ UBUNTU_COMMON_APT_DEPENDENCIES = COMMON_DEPENDENCIES + [
COMMON_YUM_DEPENDENCIES = COMMON_DEPENDENCIES + [
"redis",
"hunspell-en-US",
"yuicompressor",
"rubygem-puppet-lint",
"nmap-ncat",
"fontconfig", # phantomjs dependencies from here until libstdc++

2
tools/test-install/prepare-base
View File

@ -48,7 +48,7 @@ run apt-get install -y --no-install-recommends \
git crudini openssl ssl-cert \
build-essential python3-dev \
memcached rabbitmq-server redis-server \
hunspell-en-us supervisor libssl-dev yui-compressor puppet \
hunspell-en-us supervisor libssl-dev puppet \
gettext libffi-dev libfreetype6-dev zlib1g-dev libjpeg-dev \
libldap2-dev libmemcached-dev python-dev python-pip \
python-six libxml2-dev libxslt1-dev libpq-dev \

2
version.py
View File

@ -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 = '43.0'
PROVISION_VERSION = '44.0'