kallithea Changeset - d5e16407bdbb

Changeset - d5e16407bdbb

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 7 1

Mads Kiilerich - 10 years ago 2016-03-14 00:36:08
madski@unity3d.com

Merge stable

8 files changed with 21 insertions and 7 deletions:

.hgsigs

.hgtags

docs/contributing.rst

docs/installation.rst

docs/overview.rst

kallithea/__init__.py

kallithea/lib/auth_modules/auth_pam.py

requirements.txt

0 comments (0 inline, 0 general)

.hgsigs

➞

Show inline comments

9b3e9e242f5c97cc0c7657e5ac93dce7de61ca16 0 iQEcBAABAgAGBQJWDuAdAAoJEJ1bI/kYT6UUAlYH/ReCa7Im5tvy+ot5oAc7xey/O2rCVHp2h6i82tTWK/0i9EaS4DP+eTbAjV4WJA4qWF5DPenEJ3X9JhrTLNvGkR0f7lUqiFVMTJ472YlSsvIWg38gVFruzwk1cODRfq72o8ERYcRSfzrL4cDpIqjEd/vVVCV/gKVvPmzr4/FED/ZmS0X6T9gxWJo/eWSuLNAxHHtE/pCWDO3XEe+iOm+hHjkyz4Hn2r9/+ucrirnzycH6DnYO/kWvQzBnzgMjJm+1rLZ5cfU89V8zfhv6z0pd8CHZfpKGc2Z8EwVJq9LR+M4/76uDlYXx7IfZAxhRNqN6MC+yvPmDo3382dNr7Wkopi0=

9bf8eb837e785b6856ccfac264e977ce3ebe1535 0 iQEcBAABAgAGBQJW5XaVAAoJEJ1bI/kYT6UUbeMH/AsGg21jTc0tTT+228T+WfrfkbxrPkkULQF/Eo3ChlrhnFZ5B1y7ellSx6XGas7yKpqHHtNmrVwY3KBfUaYEljML/osEt1kvM6JGcd0vDbAW1uA2sdJR2AXmf32MjguFVhmYi9Lj79WYtgg241YGPe4dH0ompNFVqazNxCfmDBZijzSkF57FURMpV2e6+MyNq0txSo9Q82eALy0GAIX7NKQcxtynxG9ETzVzuVpeNE9MEZh0ObbUtPGezd55GXXcVqI8ZEurZwf6KHnd5M+5wxIZf84gM/k4QgQbRiIxNj4QfVmTZlVNSkC7PwSbF8twZPjlAprwldYvMi/c7ZVocEY=

.hgtags

➞

Show inline comments

@@ @@ -59,6 +59,8 @@ c15d7b336af58df9f1bbc8f8957464e7ea618d4c @@
 cc48c1541c7e2e84114bf92a0f9cd4b8b1341545 0.0
 d17e88a1a88a29f6fac948c94498129e405a40d3 0.1
 ad0ce803b40cb17fc3988373052943e041030b02 0.2
 c6e32714336345403adf76abb6ebf9b8116fcdc7 0.2.1
 f488a5dc4ca6647bc6acf12534fd137e968aa8 0.2.2
 b3e9e242f5c97cc0c7657e5ac93dce7de61ca16 0.3
 f8150c4bb0ca00dcb92f49ce9a475545863e8 0.3.1
 bf8eb837e785b6856ccfac264e977ce3ebe1535 0.3.1

docs/contributing.rst

➞

Show inline comments

@@ @@ -32,13 +32,13 @@ To get started with development:: @@
         hg clone https://kallithea-scm.org/repos/kallithea
         cd kallithea
         virtualenv ../kallithea-venv
         source ../kallithea-venv/bin/activate
         pip install --upgrade pip setuptools
-        python2 setup.py develop
+        pip install -e .
         paster make-config Kallithea my.ini
         paster setup-db my.ini --user=user --email=user@example.com --password=password --repos=/tmp
         paster serve my.ini --reload &
         firefox http://127.0.0.1:5000/
 You can also start out by forking https://bitbucket.org/conservancy/kallithea

docs/installation.rst

➞

Show inline comments

@@ @@ -37,13 +37,13 @@ repository, follow the instructions belo @@
         hg clone https://kallithea-scm.org/repos/kallithea -u stable
         cd kallithea
         virtualenv ../kallithea-venv
         source ../kallithea-venv/bin/activate
         pip install --upgrade pip setuptools
-        python2 setup.py develop
+        pip install -e .
         python2 setup.py compile_catalog   # for translation of the UI
 You can now proceed to :ref:`setup`.
 To upgrade, simply update the repository with ``hg pull -u`` and restart the
 server.
@@ @@ -93,13 +93,13 @@ An additional benefit of virtualenv_ is @@
     pip install kallithea
   Alternatively, download a .tar.gz from http://pypi.python.org/pypi/Kallithea,
   extract it and run::
-    python2 setup.py install
+    pip install .
 - This will install Kallithea together with pylons_ and all other required
   python libraries into the activated virtualenv.
 You can now proceed to :ref:`setup`.

docs/overview.rst

➞

Show inline comments

@@ @@ -50,13 +50,13 @@ installed. @@
 - The Kallithea source repository can be cloned and used -- it is kept stable and
   can be used in production. The Kallithea maintainers use the development
   branch in production. The advantage of installation from source and regularly
   updating it is that you take advantage of the most recent improvements. Using
   it directly from a DVCS also means that it is easy to track local customizations.
-  Running ``setup.py develop`` in the source will use pip to install the
+  Running ``pip install -e .`` in the source will use pip to install the
   necessary dependencies in the Python environment and create a
   ``.../site-packages/Kallithea.egg-link`` file there that points at the Kallithea
   source.
 - Kallithea can also be installed from ready-made packages using a package manager.
   The official released versions are available on PyPI_ and can be downloaded and

kallithea/__init__.py

➞

Show inline comments

@@ @@ -26,13 +26,13 @@ Original author and date, and relevant c @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 import sys
 import platform
 VERSION = (0, 3)
+VERSION = (0, 3, 99)
 BACKENDS = {
     'hg': 'Mercurial repository',
     'git': 'Git repository',
+}
 CELERY_ON = False

kallithea/lib/auth_modules/auth_pam.py

➞

Show inline comments

@@ @@ -22,13 +22,20 @@ Original author and date, and relevant c @@
 :created_on: Created on Apr 09, 2013
 :author: Alexey Larikov
 """
 import logging
 import time
 import pam
 try:
     from pam import authenticate as pam_authenticate
 except ImportError:
     # work around pam.authenticate missing in python-pam 1.8.*
     from pam import pam
     pam_authenticate = pam().authenticate
 import pwd
 import grp
 import re
 import socket
 import threading
@@ @@ -89,13 +96,13 @@ class KallitheaAuthPlugin(auth_modules.K @@
             log.debug('Empty username - skipping...')
             return None
         if username not in _auth_cache:
             # Need lock here, as PAM authentication is not thread safe
             _pam_lock.acquire()
             try:
-                auth_result = pam.authenticate(username, password,
+                auth_result = pam_authenticate(username, password,
                                                settings["service"])
                 # cache result only if we properly authenticated
                 if auth_result:
                     _auth_cache[username] = time.time()
             finally:
                 _pam_lock.release()

requirements.txt

➞

Show inline comments

@@ new file 100644 @@
 # requirements.txt file for use as "pip install -r requirements.txt" as a
 # readthedocs compatible alternative to "pip install -e ." which is a working
 # alternative to "setup.py develop" which doesn't work with Mercurial 3.7
+.

0 comments (0 inline, 0 general)