Mercurial > kallithea
changeset 6754:b777b096d9a2 stable
setup: don't use setuptools 34 - it has indirect conflicts with the celery version supported on the stable branch (Issue #266)
Setuptools==34 requires packaging>=16.8 which has an unconstrained requirement
of pyparsing ... but actually it doesn't work with pyparsing==1.5.7 ... which
is required by celery<2.3 ... which this version of Kallithea requires.
Celery has been upgraded on the development branch but we don't want to do that
on the stable branch.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Sun, 14 May 2017 01:12:56 +0200 |
| parents | 799915ed5d27 |
| children | 0ae37612bbab |
| files | docs/contributing.rst docs/installation.rst docs/installation_win.rst docs/installation_win_old.rst setup.py |
| diffstat | 5 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/contributing.rst Sun Jan 08 18:16:52 2017 +0100 +++ b/docs/contributing.rst Sun May 14 01:12:56 2017 +0200 @@ -34,7 +34,7 @@ cd kallithea virtualenv ../kallithea-venv source ../kallithea-venv/bin/activate - pip install --upgrade pip setuptools + pip install --upgrade pip "setuptools<34" pip install -e . paster make-config Kallithea my.ini paster setup-db my.ini --user=user --email=user@example.com --password=password --repos=/tmp
--- a/docs/installation.rst Sun Jan 08 18:16:52 2017 +0100 +++ b/docs/installation.rst Sun May 14 01:12:56 2017 +0200 @@ -39,7 +39,7 @@ cd kallithea virtualenv ../kallithea-venv source ../kallithea-venv/bin/activate - pip install --upgrade pip setuptools + pip install --upgrade pip "setuptools<34" pip install -e . python2 setup.py compile_catalog # for translation of the UI @@ -69,7 +69,7 @@ basic requirements are up-to-date by running:: source /srv/kallithea/venv/bin/activate - pip install --upgrade pip setuptools + pip install --upgrade pip "setuptools<34" .. note:: You can't use UNIX ``sudo`` to source the ``virtualenv`` script; it will "activate" a shell that terminates immediately. It is also perfectly
--- a/docs/installation_win.rst Sun Jan 08 18:16:52 2017 +0100 +++ b/docs/installation_win.rst Sun May 14 01:12:56 2017 +0200 @@ -134,7 +134,7 @@ cd C:\Kallithea\Env\Scripts activate - pip install --upgrade pip setuptools + pip install --upgrade pip "setuptools<34" The prompt will change into "(Env) C:\\Kallithea\\Env\\Scripts" or similar (depending of your folder structure). Then type::
--- a/docs/installation_win_old.rst Sun Jan 08 18:16:52 2017 +0100 +++ b/docs/installation_win_old.rst Sun May 14 01:12:56 2017 +0200 @@ -183,7 +183,7 @@ cd C:\Kallithea\Env\Scripts (or similar) activate - pip install --upgrade pip setuptools + pip install --upgrade pip "setuptools<34" The prompt will change into "(Env) C:\\Kallithea\\Env\\Scripts" or similar (depending of your folder structure). Then type::
--- a/setup.py Sun Jan 08 18:16:52 2017 +0100 +++ b/setup.py Sun May 14 01:12:56 2017 +0200 @@ -35,6 +35,7 @@ is_windows = __platform__ in ['Windows'] requirements = [ + "setuptools<34", # setuptools==34 has an undeclared requirement of pyparsing >=2.1, but celery<2.3 requires pyparsing<2 "waitress==0.8.8", "webob>=1.0.8,<=1.1.1", "webtest==1.4.3",