Compare commits

..

No commits in common. "master" and "v0.1.1" have entirely different histories.

4 changed files with 14 additions and 9 deletions

View file

@ -1,10 +1,4 @@
0.1.2
-----
* Allow config file to prevent logging configuration from happening.
0.1.1 0.1.1
----- -----

View file

@ -1 +1 @@
__version__ = '0.1.2' __version__ = '0.1.1'

View file

@ -89,8 +89,7 @@ def init(appname='edbob', *args, **kwargs):
shell = kwargs.get('shell', False) shell = kwargs.get('shell', False)
for paths in config_paths: for paths in config_paths:
config.read(paths, recurse=not shell) config.read(paths, recurse=not shell)
if config.getboolean('edbob', 'configure_logging', default=True): config.configure_logging()
config.configure_logging()
default_modules = 'edbob.time' default_modules = 'edbob.time'
modules = config.get('edbob', 'init', default=default_modules) modules = config.get('edbob', 'init', default=default_modules)

12
fabfile.py vendored
View file

@ -22,15 +22,27 @@
# #
################################################################################ ################################################################################
import os.path
import shutil import shutil
from fabric.api import * from fabric.api import *
execfile(os.path.join(os.path.dirname(__file__), 'edbob', '_version.py'))
@task @task
def release(): def release():
""" """
Release a new version of 'edbob'. Release a new version of 'edbob'.
""" """
shutil.rmtree('edbob.egg-info') shutil.rmtree('edbob.egg-info')
local('python setup.py sdist --formats=gztar register upload') 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')