diff --git a/CHANGES.txt b/CHANGES.txt index 8bfbfbc..688705d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,10 +1,4 @@ -0.1.2 ------ - -* Allow config file to prevent logging configuration from happening. - - 0.1.1 ----- diff --git a/edbob/_version.py b/edbob/_version.py index 10939f0..df9144c 100644 --- a/edbob/_version.py +++ b/edbob/_version.py @@ -1 +1 @@ -__version__ = '0.1.2' +__version__ = '0.1.1' diff --git a/edbob/initialization.py b/edbob/initialization.py index af2aeff..410b572 100644 --- a/edbob/initialization.py +++ b/edbob/initialization.py @@ -89,8 +89,7 @@ def init(appname='edbob', *args, **kwargs): shell = kwargs.get('shell', False) for paths in config_paths: config.read(paths, recurse=not shell) - if config.getboolean('edbob', 'configure_logging', default=True): - config.configure_logging() + config.configure_logging() default_modules = 'edbob.time' modules = config.get('edbob', 'init', default=default_modules) diff --git a/fabfile.py b/fabfile.py index 1eb4728..4e02e11 100644 --- a/fabfile.py +++ b/fabfile.py @@ -22,15 +22,27 @@ # ################################################################################ +import os.path import shutil from fabric.api import * +execfile(os.path.join(os.path.dirname(__file__), 'edbob', '_version.py')) + + @task def release(): """ Release a new version of 'edbob'. """ + shutil.rmtree('edbob.egg-info') local('python setup.py sdist --formats=gztar register upload') + + filename = 'edbob-{0}.tar.gz'.format(__version__) + + put(os.path.join('dist', filename), '/srv/pypi/{0}'.format(filename)) + with cd('/srv/pypi'): + run('rm --recursive --force simple') + run('compoze index')