Skip to content

Commit

Permalink
:add: revision version with absolute installation of etc files
Browse files Browse the repository at this point in the history
  • Loading branch information
b3j0f committed Mar 30, 2016
1 parent 9873e60 commit 01bfba4
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 19 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
__pycache__/
*.py[cod]

# virtualenv
venv

# C extensions
*.so

Expand Down
1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
include README.rst LICENSE requirements.txt changelog.rst
graft etc
File renamed without changes.
File renamed without changes.
6 changes: 4 additions & 2 deletions b3j0f/conf/driver/file/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"""

from os import environ, getenv
from os.path import exists, join, expanduser
from os.path import exists, join, expanduser, sep

from ..base import ConfDriver

Expand All @@ -50,9 +50,11 @@ def _addconfig(config, *paths):
if path is not None and exists(path):
config.append(path)

# add installation directory
_addconfig(CONF_DIRS, join(sep, *(__file__.split(sep)[:-3] + ['data'])))

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

_addconfig(
CONF_DIRS,
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.3'
__version__ = '0.3.4'
20 changes: 5 additions & 15 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@

from setuptools import setup, find_packages

from os import makedirs
from os.path import abspath, dirname, join, exists
from os.path import abspath, dirname, join

from re import compile as re_compile, S as re_S

Expand Down Expand Up @@ -68,9 +67,6 @@

URL = 'https://github.com/{0}'.format(_namepath)

if not exists(join(prefix, '.config')):
makedirs(join(prefix, '.config'))

setup(
name=NAME,
version=VERSION,
Expand All @@ -81,6 +77,9 @@
description=DESCRIPTION,
long_description=DESC,
include_package_data=True,
package_data={
'b3j0f.conf': ['data/*.conf']
},
url=URL,
license='MIT License',
classifiers=[
Expand All @@ -104,14 +103,5 @@
'Programming Language :: Python :: Implementation :: CPython'
],
test_suite='b3j0f',
keywords=KEYWORDS,
data_files=[
(
join(prefix, '.config'),
[
join('etc', 'b3j0fconf-configurable.conf'),
join('etc', 'b3j0fconf-log.conf')
]
)
]
keywords=KEYWORDS
)

0 comments on commit 01bfba4

Please sign in to comment.