Updated deps.
This commit is contained in:
Norman Jäckel
parent
affc6997f4
commit
87e386afc4
33
README.rst
33
README.rst
|
|
@ -132,9 +132,9 @@ The configuration values that have to be altered are:
|
|||
Please see:
|
||||
|
||||
* http://channels.readthedocs.io/en/latest/deploying.html
|
||||
* https://docs.djangoproject.com/en/1.9/topics/cache/
|
||||
* https://docs.djangoproject.com/en/1.10/topics/cache/
|
||||
* https://github.com/sebleier/django-redis-cache
|
||||
* https://docs.djangoproject.com/en/1.9/ref/settings/#databases
|
||||
* https://docs.djangoproject.com/en/1.10/ref/settings/#databases
|
||||
|
||||
You should use a webserver like Apache HTTP Server or nginx to serve the static
|
||||
and media files as proxy server in front of OpenSlides server. You also
|
||||
|
|
@ -147,30 +147,43 @@ Used software
|
|||
|
||||
OpenSlides uses the following projects or parts of them:
|
||||
|
||||
* `backports-abc <https://github.com/cython/backports_abc>`_,
|
||||
License: Python Software Foundation License
|
||||
* `asgiref <https://github.com/django/asgiref/>`_, License: BSD
|
||||
|
||||
* `Autobahn <http://autobahn.ws/python/>`_, License: MIT
|
||||
|
||||
* `Constantly <https://github.com/twisted/constantly>`_, License: MIT
|
||||
|
||||
* `daphne <https://github.com/django/daphne/>`_, License: BSD
|
||||
|
||||
* `Django <https://www.djangoproject.com>`_, License: BSD
|
||||
|
||||
* `Django Channels <https://github.com/django/channels>`_, License: BSD
|
||||
|
||||
* `django-jsonfield <https://github.com/bradjasper/django-jsonfield>`_,
|
||||
License: MIT
|
||||
|
||||
* `Django REST framework <http://www.django-rest-framework.org>`_, License:
|
||||
BSD
|
||||
|
||||
* `Django Channels <https://github.com/andrewgodwin/channels/>`_, License: MIT
|
||||
|
||||
* `django-jsonfield <https://github.com/bradjasper/django-jsonfield/>`_,
|
||||
License: MIT
|
||||
* `Incremental <https://github.com/hawkowl/incremental>`_, License: MIT
|
||||
|
||||
* `PyPDF2 <http://mstamy2.github.io/PyPDF2/>`_, License: BSD
|
||||
|
||||
* `roman <https://pypi.python.org/pypi/roman>`_, License: Python 2.1.1
|
||||
|
||||
* `setuptools <https://pypi.python.org/pypi/setuptools>`_,
|
||||
License: Python Software Foundation License
|
||||
* `setuptools <https://pypi.python.org/pypi/setuptools>`_, License: MIT
|
||||
|
||||
* `Six <http://pythonhosted.org/six/>`_, License: MIT
|
||||
|
||||
* `Twisted <https://twistedmatrix.com>`_, License: MIT
|
||||
|
||||
* `txaio <https://github.com/crossbario/txaio>`_, License: MIT
|
||||
|
||||
* `Whoosh <https://bitbucket.org/mchaput/whoosh/wiki/Home>`_, License: BSD
|
||||
|
||||
* `zope.interface <https://github.com/zopefoundation/zope.interface>`,
|
||||
License: ZPL 2.1
|
||||
|
||||
* Several JavaScript packages (see ``bower.json``)
|
||||
|
||||
* `angular <http://angularjs.org>`_, License: MIT
|
||||
|
|
|
|||
48
gulpfile.js
48
gulpfile.js
|
|
@ -119,30 +119,40 @@ gulp.task('ckeditor-defaults', function () {
|
|||
|
||||
// CKEditor skins
|
||||
gulp.task('ckeditor-skins', function () {
|
||||
return gulp.src([
|
||||
path.join('bower_components', 'ckeditor', 'skins', 'moono-lisa', '**', '*'),
|
||||
],{ base: path.join('bower_components', 'ckeditor', 'skins') })
|
||||
return gulp.src(
|
||||
[
|
||||
path.join('bower_components', 'ckeditor', 'skins', 'moono-lisa', '**', '*'),
|
||||
],
|
||||
{
|
||||
base: path.join('bower_components', 'ckeditor', 'skins')
|
||||
}
|
||||
)
|
||||
.pipe(gulp.dest(path.join(output_directory, 'ckeditor', 'skins')));
|
||||
});
|
||||
|
||||
// CKEditor plugins
|
||||
gulp.task('ckeditor-plugins', function () {
|
||||
return gulp.src([
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'clipboard', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'colorbutton', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'dialog', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'find', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'image', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'justify', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'liststyle', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'magicline', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'pastefromword', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'panelbutton', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'showblocks', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'sourcedialog', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'table', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'tabeltools', '**', '*'),
|
||||
],{ base: path.join('bower_components', 'ckeditor', 'plugins') })
|
||||
return gulp.src(
|
||||
[
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'clipboard', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'colorbutton', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'dialog', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'find', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'image', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'justify', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'liststyle', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'magicline', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'pastefromword', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'panelbutton', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'showblocks', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'sourcedialog', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'table', '**', '*'),
|
||||
path.join('bower_components', 'ckeditor', 'plugins', 'tabeltools', '**', '*'),
|
||||
],
|
||||
{
|
||||
base: path.join('bower_components', 'ckeditor', 'plugins')
|
||||
}
|
||||
)
|
||||
.pipe(gulp.dest(path.join(output_directory, 'ckeditor', 'plugins')));
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
# Requirements for OpenSlides in production in alphabetical order
|
||||
Django>=1.10.1,<1.11
|
||||
channels>=0.15,<1.0
|
||||
channels>=0.17,<1.0
|
||||
Django>=1.10.4,<1.11
|
||||
djangorestframework>=3.4,<3.5
|
||||
jsonfield>=0.9.19,<1.1
|
||||
PyPDF2>=1.25.0,<1.27
|
||||
jsonfield>=1.0,<1.1
|
||||
PyPDF2>=1.26,<1.27
|
||||
roman>=2.0,<2.1
|
||||
setuptools>=18.5,<28.0
|
||||
twisted>=16.2,<16.4
|
||||
Whoosh>=2.7.0,<2.8
|
||||
setuptools>=18.5,<33.0
|
||||
Twisted>=16.6,<16.7
|
||||
Whoosh>=2.7,<2.8
|
||||
|
|
|
|||
Loading…
Reference in New Issue