From 23d77edd4c748e9758b48b5297f8b3c899c5c156 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Mon, 17 Mar 2014 14:27:29 -0300 Subject: Pin psutil version to avoid conflicts with gnupg. gnupg 1.2.5 requires psutil==1.2.1 --- changes/bug-5309_psutil-version-conflict | 1 + pkg/requirements.pip | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changes/bug-5309_psutil-version-conflict diff --git a/changes/bug-5309_psutil-version-conflict b/changes/bug-5309_psutil-version-conflict new file mode 100644 index 00000000..e7ccb2fc --- /dev/null +++ b/changes/bug-5309_psutil-version-conflict @@ -0,0 +1 @@ +- Fix psutil version to avoid conflicts with gnupg required version. Closes #5309. diff --git a/pkg/requirements.pip b/pkg/requirements.pip index c8f6b101..850ccf44 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -10,7 +10,7 @@ requests>=1.1.0 srp>=1.0.2 pyopenssl python-dateutil -psutil +psutil==1.2.1 ipaddr twisted python-daemon # this should not be needed for Windows. -- cgit v1.2.3