mirror of https://github.com/nicolargo/glances.git
Fix source distribution
Add missing files to MANIFEST.in Better package structure Better path handling
This commit is contained in:
Alessio Sergi
parent
503147f17e
commit
d997802de1
|
|
@ -2,5 +2,11 @@ include AUTHORS
|
|||
include COPYING
|
||||
include NEWS
|
||||
include README.rst
|
||||
recursive-include docs images/*.png man/glances.1 glances-doc.html
|
||||
include conf/glances.conf
|
||||
include glances/data/css/*.css
|
||||
include glances/data/html/*.html
|
||||
include glances/data/img/*.png
|
||||
include man/glances.1
|
||||
recursive-include docs images/*.png glances-doc.html
|
||||
recursive-include i18n *.mo
|
||||
prune docs/_build
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Glances an eye on your system
|
||||
# Glances - An eye on your system
|
||||
#
|
||||
# Copyright (C) 2013 Nicolargo <nicolas@nicolargo.com>
|
||||
#
|
||||
|
|
@ -172,16 +172,16 @@ else:
|
|||
csv_lib_tag = True
|
||||
|
||||
# path definitions
|
||||
local_path = os.path.dirname(os.path.realpath(__file__))
|
||||
work_path = os.path.realpath(os.path.dirname(__file__))
|
||||
appname_path = os.path.split(sys.argv[0])[0]
|
||||
sys_prefix = os.path.dirname(os.path.realpath(appname_path))
|
||||
sys_prefix = os.path.realpath(os.path.dirname(appname_path))
|
||||
|
||||
# i18n
|
||||
locale.setlocale(locale.LC_ALL, '')
|
||||
gettext_domain = __appname__
|
||||
|
||||
# get locale directory
|
||||
i18n_path = os.path.join(local_path, '..', 'i18n')
|
||||
i18n_path = os.path.realpath(os.path.join(work_path, '..', 'i18n'))
|
||||
sys_i18n_path = os.path.join(sys_prefix, 'share', 'locale')
|
||||
|
||||
if os.path.exists(i18n_path):
|
||||
|
|
@ -214,7 +214,6 @@ if is_Windows and is_colorConsole:
|
|||
except ImportError:
|
||||
import queue
|
||||
|
||||
|
||||
class ListenGetch(threading.Thread):
|
||||
|
||||
def __init__(self, nom=''):
|
||||
|
|
@ -238,7 +237,6 @@ if is_Windows and is_colorConsole:
|
|||
except Exception:
|
||||
return default
|
||||
|
||||
|
||||
class Screen():
|
||||
|
||||
COLOR_DEFAULT_WIN = '0F' # 07'#'0F'
|
||||
|
|
@ -295,7 +293,6 @@ if is_Windows and is_colorConsole:
|
|||
self.term.restore_buffered_mode()
|
||||
return None
|
||||
|
||||
|
||||
class WCurseLight():
|
||||
|
||||
COLOR_WHITE = colorconsole.terminal.colors["WHITE"]
|
||||
|
|
@ -408,7 +405,7 @@ class Config:
|
|||
Get a list of config file paths, taking into account of the OS,
|
||||
priority and location.
|
||||
|
||||
* running from source: /path/to/glances/glances/conf
|
||||
* running from source: /path/to/glances/conf
|
||||
* Linux: ~/.config/glances, /etc/glances
|
||||
* BSD: ~/.config/glances, /usr/local/etc/glances
|
||||
* Mac: ~/Library/Application Support/glances, /usr/local/etc/glances
|
||||
|
|
@ -416,18 +413,18 @@ class Config:
|
|||
|
||||
The config file will be searched in the following order of priority:
|
||||
* /path/to/file (via -C flag)
|
||||
* /path/to/glances/glances/conf
|
||||
* /path/to/glances/conf
|
||||
* user's home directory (per-user settings)
|
||||
* {/usr/local,}/etc directory (system-wide settings)
|
||||
"""
|
||||
paths = []
|
||||
conf_path = os.path.join(local_path, 'conf', self.filename)
|
||||
conf_path = os.path.realpath(os.path.join(work_path, '..', 'conf'))
|
||||
|
||||
if self.location is not None:
|
||||
paths.append(self.location)
|
||||
|
||||
if os.path.exists(conf_path):
|
||||
paths.append(conf_path)
|
||||
paths.append(os.path.join(conf_path, self.filename))
|
||||
|
||||
if is_Linux or is_BSD:
|
||||
paths.append(os.path.join(
|
||||
|
|
@ -3820,11 +3817,11 @@ class glancesHtml:
|
|||
# Set the HTML output file
|
||||
self.html_file = os.path.join(html_path, html_filename)
|
||||
|
||||
# Get the working path
|
||||
self.work_path = self.get_work_path()
|
||||
# Get data path
|
||||
data_path = os.path.join(work_path, 'data')
|
||||
|
||||
# Set the templates path
|
||||
template_path = os.path.join(self.work_path, 'html')
|
||||
# Set the template path
|
||||
template_path = os.path.join(data_path, 'html')
|
||||
environment = jinja2.Environment(
|
||||
loader=jinja2.FileSystemLoader(template_path),
|
||||
extensions=['jinja2.ext.loopcontrols'])
|
||||
|
|
@ -3841,27 +3838,6 @@ class glancesHtml:
|
|||
'CRITICAL': "bgcritical fgcritical"
|
||||
}
|
||||
|
||||
def get_work_path(self):
|
||||
"""
|
||||
Get the working path
|
||||
|
||||
The data files will be searched in the following paths:
|
||||
* /path/to/glances/glances/data (local)
|
||||
* {/usr,/usr/local}/share/glances (system-wide)
|
||||
"""
|
||||
# get local and system-wide data paths
|
||||
data_path = os.path.join(local_path, 'data')
|
||||
sys_data_path = os.path.join(sys_prefix, 'share', __appname__)
|
||||
|
||||
if os.path.exists(data_path):
|
||||
work_path = data_path
|
||||
elif os.path.exists(sys_data_path):
|
||||
work_path = sys_data_path
|
||||
else:
|
||||
work_path = ""
|
||||
|
||||
return work_path
|
||||
|
||||
def __getAlert(self, current=0, max=100):
|
||||
# If current < CAREFUL of max then alert = OK
|
||||
# If current > CAREFUL of max then alert = CAREFUL
|
||||
|
|
@ -4298,6 +4274,7 @@ class GlancesClient():
|
|||
# Global def
|
||||
#===========
|
||||
|
||||
|
||||
def printVersion():
|
||||
print(_("Glances version ") + __version__ + _(" with PsUtil ") + psutil.__version__)
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
psutil==1.1.3
|
||||
psutil==1.2.1
|
||||
|
|
|
|||
12
setup.py
12
setup.py
|
|
@ -8,13 +8,9 @@ from setuptools import setup
|
|||
|
||||
data_files = [
|
||||
('share/doc/glances', ['AUTHORS', 'COPYING', 'NEWS', 'README.rst',
|
||||
'docs/glances-doc.html',
|
||||
'glances/conf/glances.conf']),
|
||||
'conf/glances.conf', 'docs/glances-doc.html']),
|
||||
('share/doc/glances/images', glob.glob('docs/images/*.png')),
|
||||
('share/glances/css', glob.glob('glances/data/css/*.css')),
|
||||
('share/glances/html', glob.glob('glances/data/html/*.html')),
|
||||
('share/glances/img', glob.glob('glances/data/img/*.png')),
|
||||
('share/man/man1', ['docs/man/glances.1'])
|
||||
('share/man/man1', ['man/glances.1'])
|
||||
]
|
||||
|
||||
if hasattr(sys, 'real_prefix') or 'bsd' in sys.platform:
|
||||
|
|
@ -25,7 +21,7 @@ elif 'darwin' in sys.platform:
|
|||
conf_path = os.path.join('/usr/local', 'etc', 'glances')
|
||||
elif 'win32' in sys.platform:
|
||||
conf_path = os.path.join(os.environ.get('APPDATA'), 'glances')
|
||||
data_files.append((conf_path, ['glances/conf/glances.conf']))
|
||||
data_files.append((conf_path, ['conf/glances.conf']))
|
||||
|
||||
for mo in glob.glob('i18n/*/LC_MESSAGES/*.mo'):
|
||||
data_files.append((os.path.dirname(mo).replace('i18n/', 'share/locale/'), [mo]))
|
||||
|
|
@ -43,7 +39,7 @@ setup(
|
|||
author='Nicolas Hennion',
|
||||
author_email='nicolas@nicolargo.com',
|
||||
url='https://github.com/nicolargo/glances',
|
||||
# Alternative download_url='https://s3.amazonaws.com/glances/glances-1.7.1.tar.gz',
|
||||
# download_url='https://s3.amazonaws.com/glances/glances-1.7.1.tar.gz',
|
||||
license="LGPL",
|
||||
keywords="cli curses monitoring system",
|
||||
install_requires=requires,
|
||||
|
|
|
|||
Loading…
Reference in New Issue