NXDRIVE-979: Upgrade requirements: psutil, pytest and pytest-sugar

- Update psutil from 5.2.2 to 5.3.1
- Update pytest from 3.2.1 to 3.2.2
- Update pytest-sugar from 0.8.0 to 0.9.0

Also:
- NXDRIVE-983: Copy all DLL in any cases ...

docs/changes.md

@@ -12,6 +12,9 @@ Release date: `2017-??-??`
 #### Minor changes
 - Utils: `guess_server_url()` now checks for the good HTTP status code
 - Tests: Moved a big part of RemoteDocumentClient methods into tests
+- Packaging: Updated `psutil` from 5.2.2 to 5.3.1
+- Packaging: Updated `pytest` from 3.2.1 to 3.2.2
+- Packaging: Updated `pytest-sugar` from 0.8.0 to 0.9.0
 
 
 # 2.5.3

nuxeo-drive-client/nxdrive/engine/processor.py

@@ -512,7 +512,7 @@ def _synchronize_locally_created(self, doc_pair, local_client,
 
             try:
                 if info.state == 'deleted':
-                    log.debug("Untrash from the client: %r", doc_pair)
+                    log.debug('Untrash from the client: %r', doc_pair)
                     remote_doc_client.undelete(uid)
                     remote_parent_path = (parent_pair.remote_parent_path + '/'
                                           + parent_pair.remote_ref)
@@ -523,18 +523,19 @@ def _synchronize_locally_created(self, doc_pair, local_client,
                             fs_item_info.uid, parent_pair.remote_ref)
                     # Handle document rename
                     if fs_item_info.name != doc_pair.local_name:
-                        fs_item_info = remote_client.rename(fs_item_info.uid,
-                                                            doc_pair.local_name)
+                        fs_item_info = remote_client.rename(
+                            fs_item_info.uid, doc_pair.local_name)
                     self._dao.update_remote_state(
                         doc_pair, fs_item_info,
                         remote_parent_path=remote_parent_path, versionned=False)
                     # Handle document modification - update the doc_pair
                     doc_pair = self._dao.get_state_from_id(doc_pair.id)
-                    self._synchronize_locally_modified(doc_pair, local_client,
-                                                       remote_client)
+                    self._synchronize_locally_modified(
+                        doc_pair, local_client, remote_client)
                     return
+
                 fs_item_info = remote_client.get_info(remote_ref)
-                log.trace("Compare parents: %r | %r", fs_item_info.parent_uid,
+                log.trace('Compare parents: %r | %r', fs_item_info.parent_uid,
                           parent_pair.remote_ref)
                 # Document exists on the server
                 if (parent_pair.remote_ref is not None
@@ -544,9 +545,8 @@ def _synchronize_locally_created(self, doc_pair, local_client,
                                                           doc_pair.local_path)
                         and doc_pair.local_name == info.name):
                     if overwrite and info.folderish:
-                        self._synchronize_locally_moved(doc_pair,
-                                                        local_client,
-                                                        remote_client)
+                        self._synchronize_locally_moved(
+                            doc_pair, local_client, remote_client)
                     else:
                         log.warning(
                             'Document is already on the server should not create: %r | %r',

requirements-tests.txt

@@ -1,5 +1,5 @@
 mock==2.0.0;python_version=='2.7'
-pytest==3.2.1;python_version=='2.7'
-pytest-sugar==0.8.0;python_version=='2.7' and sys_platform!='win32'
+pytest==3.2.2;python_version=='2.7'
+pytest-sugar==0.9.0;python_version=='2.7' and sys_platform!='win32'
 pytest-timeout==1.2.0;python_version=='2.7'
 yappi==0.98;python_version=='2.7'

requirements.txt

@@ -4,7 +4,7 @@ esky==0.9.9;python_version=='2.7'
 faulthandler==2.6;python_version=='2.7'
 Js2Py==0.50;python_version=='2.7'
 poster==0.8.1;python_version=='2.7'
-psutil==5.2.2;python_version=='2.7'
+psutil==5.3.1;python_version=='2.7'
 pycrypto==2.6.1;python_version=='2.7'
 pypac==0.3.1;python_version=='2.7'
 python-dateutil==2.6.1;python_version=='2.7'

tools/windows/deploy_jenkins_slave.ps1

@@ -217,26 +217,17 @@ function install_pip {
 
 function install_openssl {
 	$src = "$Env:MINGW_PATH\opt\bin"
-	$dst = "$Env:WORKSPACE_DRIVE"
 
-	if (-Not (Test-Path "$dst\libeay32.dll")) {
-		echo ">>> Retrieving OpenSSL DLL: libeay32.dll"
-		Copy-Item -Force "$src\libeay32.dll" "$dst"
-		if (-Not (Test-Path "$Env:PYTHON_DIR\libeay32.dll")) {
-		    Copy-Item -Force "$src\libeay32.dll" "$Env:PYTHON_DIR"
-		}
-	}
+	echo ">>> Retrieving OpenSSL DLL: libeay32.dll"
+	Copy-Item -Force "$src\libeay32.dll" "$Env:WORKSPACE_DRIVE"
+	Copy-Item -Force "$src\libeay32.dll" "$Env:PYTHON_DIR"
 
-	if (-Not (Test-Path "$dst\ssleay32.dll")) {
-		echo ">>> Retrieving OpenSSL DLL: ssleay32.dll"
-		Copy-Item -Force "$src\ssleay32.dll" "$dst"
-		if (-Not (Test-Path "$Env:PYTHON_DIR\ssleay32.dll")) {
-		    Copy-Item -Force "$src\ssleay32.dll" "$Env:PYTHON_DIR"
-		}
-	}
+	echo ">>> Retrieving OpenSSL DLL: ssleay32.dll"
+	Copy-Item -Force "$src\ssleay32.dll" "$Env:WORKSPACE_DRIVE"
+	Copy-Item -Force "$src\ssleay32.dll" "$Env:PYTHON_DIR"
 
 	Start-Sleep -s 5
-	if (-Not (Test-Path "$dst\libeay32.dll") -Or -Not (Test-Path "$dst\ssleay32.dll")) {
+	if (-Not (Test-Path "$Env:WORKSPACE_DRIVE\libeay32.dll") -Or -Not (Test-Path "$Env:WORKSPACE_DRIVE\ssleay32.dll")) {
 		echo ">>> Error when copying OpenSSL DLL. Aborting."
 		ExitWithCode 1
 	}