kallithea Changeset - b777b096d9a2

Changeset - b777b096d9a2

Parent rev.

Child rev.

[Not reviewed]

stable

0 5 0

Mads Kiilerich - 9 years ago 2017-05-14 01:12:56
mads@kiilerich.com

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.

5 files changed with 6 insertions and 5 deletions:

docs/contributing.rst

docs/installation.rst

docs/installation_win.rst

docs/installation_win_old.rst

setup.py

0 comments (0 inline, 0 general)

docs/contributing.rst

➞

Show inline comments

@@ @@ -34,7 +34,7 @@ To get started with development:: @@
         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

docs/installation.rst

➞

Show inline comments

@@ @@ -39,7 +39,7 @@ repository, follow the instructions belo @@
         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 @@ An additional benefit of virtualenv_ is @@
   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

docs/installation_win.rst

➞

Show inline comments

@@ @@ -134,7 +134,7 @@ In a command prompt type (adapting paths @@
   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::

docs/installation_win_old.rst

➞

Show inline comments

@@ @@ -183,7 +183,7 @@ In that CMD (loaded with VS2008 PATHs) t @@
   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::

setup.py

➞

Show inline comments

@@ @@ -35,6 +35,7 @@ __platform__ = platform.system() @@
 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",

0 comments (0 inline, 0 general)