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

[bridgedb/develop] Merge branch 'hotfix/requirements-travis' into develop
by isis＠torproject.org 30 Apr '14

30 Apr '14

commit 238b1536dbcf0e4344f097e62aa574a64844fa73 Merge: 530f2b3 4c81926 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 1 00:34:09 2014 +0000 Merge branch 'hotfix/requirements-travis' into develop .travis.yml | 7 ++----- Makefile | 6 +++++- lib/bridgedb/util.py | 40 ++++++++++++++++++++++++---------------- requirements.txt | 3 --- 4 files changed, 31 insertions(+), 25 deletions(-)

1 0

[bridgedb/develop] Call result of _getRotatingFileHandler() in unittest; it returns a partial() now.
by isis＠torproject.org 30 Apr '14

30 Apr '14

commit b0ac1b580f86b05d1071fe698d573c835c74cdb1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 1 00:45:25 2014 +0000 Call result of _getRotatingFileHandler() in unittest; it returns a partial() now. --- lib/bridgedb/test/test_util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_util.py b/lib/bridgedb/test/test_util.py index 354a4cd..a18e1c6 100644 --- a/lib/bridgedb/test/test_util.py +++ b/lib/bridgedb/test/test_util.py @@ -50,7 +50,7 @@ class MiscLoggingUtilTests(unittest.TestCase): logHandler = util._getRotatingFileHandler(filename) self.assertTrue(os.path.isfile(filename)) self.assertEqual(os.stat_result(os.stat(filename)).st_mode, 33152) - self.assertIsInstance(logHandler, + self.assertIsInstance(logHandler(), util.logging.handlers.RotatingFileHandler) def test_configureLogging(self):

1 0

[bridgedb/master] Add coverage rcfile for travis commands.
by isis＠torproject.org 30 Apr '14

30 Apr '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/master] Remove very old and unnecessary argparse dependency.
by isis＠torproject.org 30 Apr '14

30 Apr '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/master] Separate coverage commands in Makefile so that .travis.yml can use them.
by isis＠torproject.org 30 Apr '14

30 Apr '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/master] Switch to Makefile `coverage-test` directive in .travis.yml.
by isis＠torproject.org 30 Apr '14

30 Apr '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/master] Remove unused travis OS dependencies.
by isis＠torproject.org 30 Apr '14

30 Apr '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/master] Merge branch 'hotfix/requirements-travis'
by isis＠torproject.org 30 Apr '14

30 Apr '14

commit b758227593ad3e0c0893326d5917de87629997ae Merge: 10dd852 4c81926 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 1 00:33:39 2014 +0000 Merge branch 'hotfix/requirements-travis' .travis.yml | 7 ++----- Makefile | 6 +++++- lib/bridgedb/util.py | 42 +++++++++++++++++++++++++----------------- requirements.txt | 3 --- 4 files changed, 32 insertions(+), 26 deletions(-)

1 0

[bridgedb/master] Remove unused dependencies recaptcha and MarkupSafe from requirements.txt.
by isis＠torproject.org 30 Apr '14

30 Apr '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/master] Set a default logfile name, otherwise chowning chokes on it.
by isis＠torproject.org 30 Apr '14

30 Apr '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