May 2014 - tor-commits - lists.torproject.org

[bridgedb/develop] Remove unused travis OS dependencies.
by isis＠torproject.org 01 May '14

01 May '14

commit 8d1eb42183d469bf868fd05c6fea0dfa600ab3c5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 22:08:05 2014 +0000 Remove unused travis OS dependencies. --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7aef0ca..69f1c19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,9 +19,7 @@ notifications: before_install: - sudo apt-get update # Distro development header/library/resource/buildtime dependencies - - sudo apt-get install --no-install-suggests --no-install-recommends build-essential openssl sqlite3 libgpgme11 libgpgme11-dev libgeoip-dev geoip-database - # Distro python dependencies - - sudo apt-get install --no-install-suggests --no-install-recommends python-dev python-setuptools + - sudo apt-get install --no-install-suggests --no-install-recommends build-essential openssl sqlite3 libgpgme11 libgpgme11-dev python-dev python-setuptools python: - "2.7"

1 0

[bridgedb/develop] Add coverage rcfile for travis commands.
by isis＠torproject.org 01 May '14

01 May '14

commit f736ed17d3184d90f50f95d2bd838e0d619f45b3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 22:08:55 2014 +0000 Add coverage rcfile for travis commands. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 69f1c19..4a21528 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,8 +30,8 @@ install: - make install script: - - coverage run $(which trial) ./lib/bridgedb/test/test_*.py - - coverage report + - coverage run --rcfile=".coveragerc" $(which trial) ./lib/bridgedb/test/test_*.py + - coverage report --rcfile=".coveragerc" after_success: - coveralls

1 0

[bridgedb/develop] Remove very old and unnecessary argparse dependency.
by isis＠torproject.org 01 May '14

01 May '14

commit b794bddf6409550d0fb677525f052bc5853dc4b0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 22:09:42 2014 +0000 Remove very old and unnecessary argparse dependency. It appears to be breaking CI builds: https://travis-ci.org/isislovecruft/bridgedb/builds/24138587 --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2d1be77..80ebcb5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,4 +11,3 @@ pygpgme==0.3 recaptcha==1.0rc1 recaptcha-client==1.0.6 zope.interface>=4.0.5 -argparse==1.2.1

1 0

[bridgedb/develop] Separate coverage commands in Makefile so that .travis.yml can use them.
by isis＠torproject.org 01 May '14

01 May '14

commit 662a07ea0fd04e4a89ebb8da18f3e5e3a2f0be16 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 22:18:01 2014 +0000 Separate coverage commands in Makefile so that .travis.yml can use them. Because we only want the first two commands to run on TravisCI. This changes nothing for the `make coverage` directive, it'll still function in the same way. --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 22a231e..aa594c1 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,11 @@ clean: -rm -rf lib/bridgedb.egg-info -rm -rf _trial_temp -coverage: +coverage-test: -coverage run --rcfile=".coveragerc" $(TRIAL) ./lib/bridgedb/test/test_*.py -coverage report --rcfile=".coveragerc" + +coverage-html: -coverage html --rcfile=".coveragerc" + +coverage: coverage-test coverage-html

1 0

[bridgedb/develop] Add missing parens after call to _getRotatingFileHandler in util.
by isis＠torproject.org 01 May '14

01 May '14

commit 0c1e12efb4ea61f2ba88c16a71fc627f5fb06de2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 22:54:33 2014 +0000 Add missing parens after call to _getRotatingFileHandler in util. --- lib/bridgedb/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index 691b9bc..5b0cd48 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -111,7 +111,7 @@ def configureLogging(cfg): 'level': logLevel, 'formatter': 'default', 'filters': logFilters}, - 'rotating': {'()': _getRotatingFileHandler, + 'rotating': {'()': _getRotatingFileHandler(), 'level': logLevel, 'formatter': 'default', 'filters': logFilters,

1 0

[bridgedb/develop] Remove unused dependencies recaptcha and MarkupSafe from requirements.txt.
by isis＠torproject.org 01 May '14

01 May '14

commit b8ef7459f6cc821f100efe35100177c7b2bdaa9b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 22:21:59 2014 +0000 Remove unused dependencies recaptcha and MarkupSafe from requirements.txt. --- requirements.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 80ebcb5..f07f1a1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,11 @@ Babel==0.9.6 BeautifulSoup==3.2.1 Mako==0.8.1 -MarkupSafe==0.18 Twisted==13.1.0 https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b07… pycrypto==2.6.1 pyOpenSSL==0.13.1 pygeoip==0.2.7 pygpgme==0.3 -recaptcha==1.0rc1 recaptcha-client==1.0.6 zope.interface>=4.0.5

1 0

[bridgedb/develop] Switch to Makefile `coverage-test` directive in .travis.yml.
by isis＠torproject.org 01 May '14

01 May '14

commit bcacd84c6bf3876280cc1f704cc2db8f18e2d67d Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 22:52:08 2014 +0000 Switch to Makefile `coverage-test` directive in .travis.yml. --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4a21528..09bfe59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,8 +30,7 @@ install: - make install script: - - coverage run --rcfile=".coveragerc" $(which trial) ./lib/bridgedb/test/test_*.py - - coverage report --rcfile=".coveragerc" + - make coverage-test after_success: - coveralls

1 0

[bridgedb/develop] Set a default logfile name, otherwise chowning chokes on it.
by isis＠torproject.org 01 May '14

01 May '14

commit b4cae6df49d334f15cd80f87149f1c38991ea298 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 23:22:34 2014 +0000 Set a default logfile name, otherwise chowning chokes on it. --- lib/bridgedb/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index cc9c65d..00e4ce5 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -84,7 +84,7 @@ def configureLogging(cfg): level = getattr(cfg, 'LOGLEVEL', 'WARNING') logLevel = getattr(logging, level, 0) logStderr = getattr(cfg, 'LOG_TO_STDERR', False) - logfileName = getattr(cfg, 'LOGFILE', "") + logfileName = getattr(cfg, 'LOGFILE', "bridgedb.log") logfileCount = getattr(cfg, 'LOGFILE_COUNT', 3) - 1 logfileRotateSize = getattr(cfg, 'LOGFILE_ROTATE_SIZE', 10000000) logThreads = getattr(cfg, 'LOG_THREADS', False)

1 0

[bridgedb/develop] Fix problems with rotating logfile handler in newest python2.7.6.
by isis＠torproject.org 01 May '14

01 May '14

commit 09b2db614e6ed2916ca10b04848e9e3904e7f358 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 23:20:35 2014 +0000 Fix problems with rotating logfile handler in newest python2.7.6. --- lib/bridgedb/util.py | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index 5b0cd48..cc9c65d 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -11,6 +11,8 @@ """Common utilities for BridgeDB.""" +from functools import partial + import logging import logging.config import logging.handlers @@ -33,16 +35,16 @@ def _getLogHandlers(logToFile=True, logToStderr=True): logHandlers.append('console') return logHandlers -def _getRotatingFileHandler(filename, mode='a', filesize=1000000, filecount=0, +def _getRotatingFileHandler(filename, mode='a', maxBytes=1000000, backupCount=0, encoding='utf-8', uid=None, gid=None): """Get a :class:`logging.RotatingFileHandler` with a logfile which is readable+writable only by the given **uid** and **gid**. :param str filename: The full path to the log file. :param str mode: The mode to open **filename** with. (default: ``'a'``) - :param int filesize: Rotate logfiles after they have grown to this size in + :param int maxBytes: Rotate logfiles after they have grown to this size in bytes. - :param int filecount: The number of logfiles to keep in rotation. + :param int backupCount: The number of logfiles to keep in rotation. :param str encoding: The encoding for the logfile. :param int uid: The owner UID to set on the logfile. :param int gid: The GID to set on the logfile. @@ -59,10 +61,12 @@ def _getRotatingFileHandler(filename, mode='a', filesize=1000000, filecount=0, os.chown(filename, uid, gid) os.chmod(filename, os.ST_WRITE | os.ST_APPEND) - fileHandler = logging.handlers.RotatingFileHandler(filename, mode, - maxBytes=filesize, - backupCount=filecount, - encoding=encoding) + fileHandler = partial(logging.handlers.RotatingFileHandler, + filename, + mode, + maxBytes=maxBytes, + backupCount=backupCount, + encoding=encoding) return fileHandler def configureLogging(cfg): @@ -111,15 +115,12 @@ def configureLogging(cfg): 'level': logLevel, 'formatter': 'default', 'filters': logFilters}, - 'rotating': {'()': _getRotatingFileHandler(), + 'rotating': {'()': _getRotatingFileHandler(logfileName, 'a', + logfileRotateSize, + logfileCount), 'level': logLevel, 'formatter': 'default', - 'filters': logFilters, - # The values below are passed to the handler creator, - # :func:`getChownedFileHandler`, as kwargs: - 'filename': logfileName, - 'filesize': logfileRotateSize, - 'filecount': logfileCount}, + 'filters': logFilters}, }, 'root': { 'handlers': _getLogHandlers(logfileName, logStderr),

1 0

[bridgedb/develop] Add weird except handler for missing os.ST_WRITE in Travis.
by isis＠torproject.org 01 May '14

01 May '14

commit 4c81926ba1f6da1642c5b5d29ce303293bfec0a8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 1 00:27:24 2014 +0000 Add weird except handler for missing os.ST_WRITE in Travis. --- lib/bridgedb/util.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index 00e4ce5..66b228b 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -59,7 +59,14 @@ def _getRotatingFileHandler(filename, mode='a', maxBytes=1000000, backupCount=0, if not os.path.exists(filename): open(filename, 'a').close() os.chown(filename, uid, gid) - os.chmod(filename, os.ST_WRITE | os.ST_APPEND) + try: + os.chmod(filename, os.ST_WRITE | os.ST_APPEND) + except AttributeError: + logging.error(""" + XXX FIXME: Travis chokes on `os.ST_WRITE` saying that the module doesn't + have that attribute, for some reason: + https://travis-ci.org/isislovecruft/bridgedb/builds/24145963#L1601""") + os.chmod(filename, 384) fileHandler = partial(logging.handlers.RotatingFileHandler, filename,

1 0