mirror of
https://github.com/nicolargo/glances.git
synced 2024-09-11 12:47:14 +03:00
Refactor setup.py
This commit is contained in:
commit
c98b7fcf1d
6
NEWS.rst
6
NEWS.rst
@ -10,6 +10,12 @@ Under development, see roadmap here: https://github.com/nicolargo/glances/milest
|
|||||||
|
|
||||||
Contributors are welcome !
|
Contributors are welcome !
|
||||||
|
|
||||||
|
===============
|
||||||
|
Version 4.0.1
|
||||||
|
===============
|
||||||
|
|
||||||
|
Correct issue with CI (miss pydantic dep).
|
||||||
|
|
||||||
===============
|
===============
|
||||||
Version 4.0.0
|
Version 4.0.0
|
||||||
===============
|
===============
|
||||||
|
@ -87,7 +87,9 @@ class PluginModel(GlancesPluginModel):
|
|||||||
|
|
||||||
# Init the sensor class
|
# Init the sensor class
|
||||||
start_duration.reset()
|
start_duration.reset()
|
||||||
self.glances_grab_sensors = GlancesGrabSensors()
|
# Hotfix! Refactor to use only one `GlancesGrabSensors` later
|
||||||
|
self.glances_grab_sensors_fan_speed = GlancesGrabSensors()
|
||||||
|
self.glances_grab_sensors_temperature = GlancesGrabSensors()
|
||||||
logger.debug("Generic sensor plugin init duration: {} seconds".format(start_duration.get()))
|
logger.debug("Generic sensor plugin init duration: {} seconds".format(start_duration.get()))
|
||||||
|
|
||||||
# Instance for the HDDTemp Plugin in order to display the hard disks
|
# Instance for the HDDTemp Plugin in order to display the hard disks
|
||||||
@ -115,7 +117,7 @@ class PluginModel(GlancesPluginModel):
|
|||||||
|
|
||||||
def __get_temperature(self, stats, index):
|
def __get_temperature(self, stats, index):
|
||||||
try:
|
try:
|
||||||
temperature = self.__set_type(self.glances_grab_sensors.get(SENSOR_TEMP_TYPE), SENSOR_TEMP_TYPE)
|
temperature = self.__set_type(self.glances_grab_sensors_temperature.get(SENSOR_TEMP_TYPE), SENSOR_TEMP_TYPE)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error("Cannot grab sensors temperatures (%s)" % e)
|
logger.error("Cannot grab sensors temperatures (%s)" % e)
|
||||||
else:
|
else:
|
||||||
@ -123,7 +125,7 @@ class PluginModel(GlancesPluginModel):
|
|||||||
|
|
||||||
def __get_fan_speed(self, stats, index):
|
def __get_fan_speed(self, stats, index):
|
||||||
try:
|
try:
|
||||||
fan_speed = self.__set_type(self.glances_grab_sensors.get(SENSOR_FAN_TYPE), SENSOR_FAN_TYPE)
|
fan_speed = self.__set_type(self.glances_grab_sensors_fan_speed.get(SENSOR_FAN_TYPE), SENSOR_FAN_TYPE)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error("Cannot grab FAN speed (%s)" % e)
|
logger.error("Cannot grab FAN speed (%s)" % e)
|
||||||
else:
|
else:
|
||||||
|
23
setup.py
23
setup.py
@ -36,19 +36,18 @@ def get_data_files():
|
|||||||
|
|
||||||
|
|
||||||
def get_install_requires():
|
def get_install_requires():
|
||||||
requires = [
|
required = []
|
||||||
'psutil>=5.6.7',
|
with open('requirements.txt') as f:
|
||||||
'defusedxml',
|
required = f.read().splitlines()
|
||||||
'packaging',
|
|
||||||
'ujson>=5.4.0',
|
|
||||||
]
|
|
||||||
if sys.platform.startswith('win'):
|
|
||||||
requires.append('fastapi')
|
|
||||||
requires.append('uvicorn')
|
|
||||||
requires.append('jinja2')
|
|
||||||
requires.append('requests')
|
|
||||||
|
|
||||||
return requires
|
# On Windows, install WebUI by default
|
||||||
|
if sys.platform.startswith('win'):
|
||||||
|
required.append('fastapi')
|
||||||
|
required.append('uvicorn')
|
||||||
|
required.append('jinja2')
|
||||||
|
required.append('requests')
|
||||||
|
|
||||||
|
return required
|
||||||
|
|
||||||
|
|
||||||
def get_install_extras_require():
|
def get_install_extras_require():
|
||||||
|
Loading…
Reference in New Issue
Block a user