diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-03-17 14:32:46 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-03-17 14:32:46 -0300 |
| commit | 03b74407d4051e2c5dfb62b8e6e8899008030d26 (patch) | |
| tree | 0eade76b8bec7a4f71af8de46be7cb4c42cedcd6 | |
| parent | f78a694b283859e4eab306dffaa0373b9f6ea8ad (diff) | |
| parent | 23d77edd4c748e9758b48b5297f8b3c899c5c156 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/5309_psutil-version-conflict' into develop
| -rw-r--r-- | changes/bug-5309_psutil-version-conflict | 1 | ||||
| -rw-r--r-- | pkg/requirements.pip | 2 |
2 files changed, 2 insertions, 1 deletions
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. |