diff --git a/NEWS.rst b/NEWS.rst index b4be1847..e70023ca 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -10,6 +10,12 @@ Under development, see roadmap here: https://github.com/nicolargo/glances/milest Contributors are welcome ! +=============== +Version 4.0.1 +=============== + +Correct issue with CI (miss pydantic dep). + =============== Version 4.0.0 =============== diff --git a/glances/plugins/sensors/__init__.py b/glances/plugins/sensors/__init__.py index 0ed9341a..0173235a 100644 --- a/glances/plugins/sensors/__init__.py +++ b/glances/plugins/sensors/__init__.py @@ -87,7 +87,9 @@ class PluginModel(GlancesPluginModel): # Init the sensor class 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())) # 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): 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: logger.error("Cannot grab sensors temperatures (%s)" % e) else: @@ -123,7 +125,7 @@ class PluginModel(GlancesPluginModel): def __get_fan_speed(self, stats, index): 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: logger.error("Cannot grab FAN speed (%s)" % e) else: diff --git a/setup.py b/setup.py index ee5b05d8..03cfe328 100755 --- a/setup.py +++ b/setup.py @@ -36,19 +36,18 @@ def get_data_files(): def get_install_requires(): - requires = [ - 'psutil>=5.6.7', - 'defusedxml', - 'packaging', - 'ujson>=5.4.0', - ] - if sys.platform.startswith('win'): - requires.append('fastapi') - requires.append('uvicorn') - requires.append('jinja2') - requires.append('requests') + required = [] + with open('requirements.txt') as f: + required = f.read().splitlines() - 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(): diff --git a/tox.ini b/tox.ini index e61d733e..3675b351 100644 --- a/tox.ini +++ b/tox.ini @@ -18,6 +18,7 @@ deps = psutil defusedxml packaging + pydantic ujson fastapi uvicorn