diff --git a/bootstrap.py b/bootstrap.py deleted file mode 100644 index a4599211f..000000000 --- a/bootstrap.py +++ /dev/null @@ -1,210 +0,0 @@ -############################################################################## -# -# Copyright (c) 2006 Zope Foundation and Contributors. -# All Rights Reserved. -# -# This software is subject to the provisions of the Zope Public License, -# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED -# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS -# FOR A PARTICULAR PURPOSE. -# -############################################################################## -"""Bootstrap a buildout-based project - -Simply run this script in a directory containing a buildout.cfg. -The script accepts buildout command-line options, so you can -use the -c option to specify an alternate configuration file. -""" - -import os -import shutil -import sys -import tempfile - -from optparse import OptionParser - -__version__ = '2015-07-01' -# See zc.buildout's changelog if this version is up to date. - -tmpeggs = tempfile.mkdtemp(prefix='bootstrap-') - -usage = '''\ -[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options] - -Bootstraps a buildout-based project. - -Simply run this script in a directory containing a buildout.cfg, using the -Python that you want bin/buildout to use. - -Note that by using --find-links to point to local resources, you can keep -this script from going over the network. -''' - -parser = OptionParser(usage=usage) -parser.add_option("--version", - action="store_true", default=False, - help=("Return bootstrap.py version.")) -parser.add_option("-t", "--accept-buildout-test-releases", - dest='accept_buildout_test_releases', - action="store_true", default=False, - help=("Normally, if you do not specify a --version, the " - "bootstrap script and buildout gets the newest " - "*final* versions of zc.buildout and its recipes and " - "extensions for you. If you use this flag, " - "bootstrap and buildout will get the newest releases " - "even if they are alphas or betas.")) -parser.add_option("-c", "--config-file", - help=("Specify the path to the buildout configuration " - "file to be used.")) -parser.add_option("-f", "--find-links", - help=("Specify a URL to search for buildout releases")) -parser.add_option("--allow-site-packages", - action="store_true", default=False, - help=("Let bootstrap.py use existing site packages")) -parser.add_option("--buildout-version", - help="Use a specific zc.buildout version") -parser.add_option("--setuptools-version", - help="Use a specific setuptools version") -parser.add_option("--setuptools-to-dir", - help=("Allow for re-use of existing directory of " - "setuptools versions")) - -options, args = parser.parse_args() -if options.version: - print("bootstrap.py version %s" % __version__) - sys.exit(0) - - -###################################################################### -# load/install setuptools - -try: - from urllib.request import urlopen -except ImportError: - from urllib2 import urlopen - -ez = {} -if os.path.exists('ez_setup.py'): - exec(open('ez_setup.py').read(), ez) -else: - exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez) - -if not options.allow_site_packages: - # ez_setup imports site, which adds site packages - # this will remove them from the path to ensure that incompatible versions - # of setuptools are not in the path - import site - # inside a virtualenv, there is no 'getsitepackages'. - # We can't remove these reliably - if hasattr(site, 'getsitepackages'): - for sitepackage_path in site.getsitepackages(): - # Strip all site-packages directories from sys.path that - # are not sys.prefix; this is because on Windows - # sys.prefix is a site-package directory. - if sitepackage_path != sys.prefix: - sys.path[:] = [x for x in sys.path - if sitepackage_path not in x] - -setup_args = dict(to_dir=tmpeggs, download_delay=0) - -if options.setuptools_version is not None: - setup_args['version'] = options.setuptools_version -if options.setuptools_to_dir is not None: - setup_args['to_dir'] = options.setuptools_to_dir - -ez['use_setuptools'](**setup_args) -import setuptools -import pkg_resources - -# This does not (always?) update the default working set. We will -# do it. -for path in sys.path: - if path not in pkg_resources.working_set.entries: - pkg_resources.working_set.add_entry(path) - -###################################################################### -# Install buildout - -ws = pkg_resources.working_set - -setuptools_path = ws.find( - pkg_resources.Requirement.parse('setuptools')).location - -# Fix sys.path here as easy_install.pth added before PYTHONPATH -cmd = [sys.executable, '-c', - 'import sys; sys.path[0:0] = [%r]; ' % setuptools_path + - 'from setuptools.command.easy_install import main; main()', - '-mZqNxd', tmpeggs] - -find_links = os.environ.get( - 'bootstrap-testing-find-links', - options.find_links or - ('http://downloads.buildout.org/' - if options.accept_buildout_test_releases else None) - ) -if find_links: - cmd.extend(['-f', find_links]) - -requirement = 'zc.buildout' -version = options.buildout_version -if version is None and not options.accept_buildout_test_releases: - # Figure out the most recent final version of zc.buildout. - import setuptools.package_index - _final_parts = '*final-', '*final' - - def _final_version(parsed_version): - try: - return not parsed_version.is_prerelease - except AttributeError: - # Older setuptools - for part in parsed_version: - if (part[:1] == '*') and (part not in _final_parts): - return False - return True - - index = setuptools.package_index.PackageIndex( - search_path=[setuptools_path]) - if find_links: - index.add_find_links((find_links,)) - req = pkg_resources.Requirement.parse(requirement) - if index.obtain(req) is not None: - best = [] - bestv = None - for dist in index[req.project_name]: - distv = dist.parsed_version - if _final_version(distv): - if bestv is None or distv > bestv: - best = [dist] - bestv = distv - elif distv == bestv: - best.append(dist) - if best: - best.sort() - version = best[-1].version -if version: - requirement = '=='.join((requirement, version)) -cmd.append(requirement) - -import subprocess -if subprocess.call(cmd) != 0: - raise Exception( - "Failed to execute command:\n%s" % repr(cmd)[1:-1]) - -###################################################################### -# Import and run buildout - -ws.add_entry(tmpeggs) -ws.require(requirement) -import zc.buildout.buildout - -if not [a for a in args if '=' not in a]: - args.append('bootstrap') - -# if -c was provided, we push it back into args for buildout' main function -if options.config_file is not None: - args[0:0] = ['-c', options.config_file] - -zc.buildout.buildout.main(args) -shutil.rmtree(tmpeggs) diff --git a/buildout.cfg b/buildout.cfg index 2f5f3a254..a19dac9fb 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -11,12 +11,4 @@ eggs = sphinx-bootstrap-theme [versions] -docutils = 0.13.1 -Jinja2 = 2.9.5 -MarkupSafe = 0.23 -Pygments = 2.2.0 -six = 1.10.0 -setuptools = 28.6.1 -Sphinx = 1.5.2 -z3c.recipe.egg = 2.0.3 -zc.buildout = 2.5.3 +Sphinx = 1.7.5 diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst index 6c83ea3b1..69af38318 100644 --- a/docs/source/configuration.rst +++ b/docs/source/configuration.rst @@ -672,7 +672,7 @@ geouri_regex Regular expression used to extract geo coordinates from links to openstreetmap. geouri_replacement ----------------- +------------------ * Default: ``'https://www.openstreetmap.org/?mlat=$1&mlon=$2#map=18/$1/$2'`` diff --git a/docs/source/features.rst b/docs/source/features.rst index df24adcba..bcab1d7fe 100644 --- a/docs/source/features.rst +++ b/docs/source/features.rst @@ -19,7 +19,7 @@ and a private chat with a URL fragment such as Off-the-record encryption ========================= -Converse.js supports `Off-the-record (OTR) `_ +Converse supports `Off-the-record (OTR) `_ encrypted messaging. The OTR protocol not only **encrypts your messages**, it provides ways to @@ -38,17 +38,17 @@ secure crypto. For harsh but fairly valid criticism of JavaScript cryptography, read: `JavaScript Cryptography Considered Harmful `_. -To get an idea on how this applies to OTR support in Converse.js, please read +To get an idea on how this applies to OTR support in Converse, please read `my thoughts on it `_. For now, suffice to say that although its useful to have OTR support in -Converse.js in order to avoid most eavesdroppers, if you need serious +Converse in order to avoid most eavesdroppers, if you need serious communications privacy, then you're much better off using native software. Notifications ============= -From version 0.8.1 Converse.js can play a sound notification when you receive a +From version 0.8.1 Converse can play a sound notification when you receive a message. For more info, refer to the :ref:`play-sounds` configuration setting. @@ -61,13 +61,10 @@ For more info, refer to the :ref:`show-desktop-notifications` configuration sett Multilingual Support ==================== -Converse.js is translated into multiple languages. The default build, -``converse.min.js``, includes all languages. - -Languages increase the size of the Converse.js significantly. - -If you only need one, or a subset of the available languages, it's better to -make a custom build which includes only those languages that you need. +Converse is translated into multiple languages. Translations are supplied in +JSON format and are loaded on demand. Converse will expect to find the +translations in the ``/locales`` path of your site. This can be changed via the +:ref:`locales-url` configuration setting. Moderating chatrooms ==================== @@ -103,7 +100,7 @@ Here are the different commands that may be used to moderate a chatroom: Passwordless login with client certificates =========================================== -Converse.js supports the SASL-EXTERNAL authentication mechanism, which can be +Converse supports the SASL-EXTERNAL authentication mechanism, which can be used together with x509 client certificates to enable passwordless login or even 2-factor authentication. diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..ffa242065 --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +zc.buildout==2.11.4