Skip to content

Commit

Permalink
:add: revision version after fixing an installation bug
Browse files Browse the repository at this point in the history
  • Loading branch information
b3j0f committed Mar 29, 2016
1 parent 8a35e0d commit 442c081
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 7 deletions.
11 changes: 10 additions & 1 deletion b3j0f/conf/driver/file/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@

from ..base import ConfDriver

from sys import prefix


CONF_DIRS = [] #: all config directories


Expand All @@ -48,7 +51,13 @@ def _addconfig(config, *paths):
config.append(path)


_addconfig(CONF_DIRS, '/etc', '/usr/local/etc') # add unix system conf
# add unix system conf
_addconfig(CONF_DIRS, '/etc', '/usr/local/etc')

_addconfig(
CONF_DIRS,
join(prefix, '.config'), join(prefix, 'config'), join(prefix, 'etc')
)

# add XDG conf dirs
_addconfig(CONF_DIRS, getenv('XDG_CONFIG_HOME'), getenv('XDG_CONFIG_DIRS'))
Expand Down
4 changes: 1 addition & 3 deletions b3j0f/conf/parser/resolver/lang/js.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@

from ..registry import register

from ..core import (
DEFAULT_BESTEFFORT, DEFAULT_SAFE, DEFAULT_TOSTR, DEFAULT_SCOPE
)
from ..core import DEFAULT_TOSTR, DEFAULT_SCOPE

try:
from PyV8 import JSContext
Expand Down
2 changes: 1 addition & 1 deletion b3j0f/conf/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@
# thanks to https://github.com/pycontribs/jira/blob/master/jira/version.py

#: project version
__version__ = '0.3.1'
__version__ = '0.3.2'
5 changes: 5 additions & 0 deletions changelog.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
ChangeLog
=========

0.3.2 (2016/03/29)
------------------

- fix installation of the configuration files.

0.3.1 (2016/03/16)
------------------

Expand Down
6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@

from setuptools import setup, find_packages

from os.path import abspath, dirname, join, expanduser
from os.path import abspath, dirname, join

from re import compile as re_compile, S as re_S

from sys import prefix

NAME = 'b3j0f.conf' #: library name.

_namepath = NAME.replace('.', '/')
Expand Down Expand Up @@ -101,7 +103,7 @@
keywords=KEYWORDS,
data_files=[
(
expanduser(join('~', '.config')),
join(prefix, '.config'),
[
join('etc', 'b3j0fconf-configurable.conf'),
join('etc', 'b3j0fconf-log.conf')
Expand Down

0 comments on commit 442c081

Please sign in to comment.