Unverified Commit 7f902996 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Added psutil to requirements.


Signed-off-by: Daniel Scheffler's avatardanschef <daniel.scheffler@gfz-potsdam.de>
parent 7c1e78a8
Pipeline #6457 passed with stage
in 35 seconds
...@@ -32,6 +32,7 @@ from threading import Thread ...@@ -32,6 +32,7 @@ from threading import Thread
from queue import Queue from queue import Queue
from multiprocessing import cpu_count from multiprocessing import cpu_count
from glob import glob from glob import glob
import psutil
from qgis.PyQt.QtGui import QIcon from qgis.PyQt.QtGui import QIcon
from qgis.PyQt.QtWidgets import QMenu, QAction, QDialog, QHBoxLayout, QLabel, QPushButton from qgis.PyQt.QtWidgets import QMenu, QAction, QDialog, QHBoxLayout, QLabel, QPushButton
...@@ -437,7 +438,6 @@ class EnPTAlgorithm(QgsProcessingAlgorithm): ...@@ -437,7 +438,6 @@ class EnPTAlgorithm(QgsProcessingAlgorithm):
if qgis_feedback.isCanceled(): if qgis_feedback.isCanceled():
# qgis_feedback.reportError('CANCELED') # qgis_feedback.reportError('CANCELED')
import psutil
proc2kill = psutil.Process(process.pid) proc2kill = psutil.Process(process.pid)
for proc in proc2kill.children(recursive=True): for proc in proc2kill.children(recursive=True):
proc.kill() proc.kill()
......
...@@ -39,6 +39,7 @@ with open("enpt_enmapboxapp/version.py", encoding='utf-8') as version_file: ...@@ -39,6 +39,7 @@ with open("enpt_enmapboxapp/version.py", encoding='utf-8') as version_file:
exec(version_file.read(), version) exec(version_file.read(), version)
requirements = [ requirements = [
'psutil',
# 'qgis', # 'qgis',
# 'enmapbox' # 'enmapbox'
] ]
......
...@@ -5,6 +5,7 @@ dependencies: ...@@ -5,6 +5,7 @@ dependencies:
- pip # avoids that conda uses the wrong pip - pip # avoids that conda uses the wrong pip
- pip: - pip:
- psutil
- sphinx-argparse - sphinx-argparse
- pycodestyle - pycodestyle
- flake8 - flake8
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment