NXDRIVE-940: Release 3.0.4

* Added Options.server_info * Updater: Skip exception on 404 errors * Upgraded SIP from 4.19.6 to 4.19.7
nuxeo · Jan 29, 2018 · 2de21b1 · 2de21b1
1 parent 34372a4
commit 2de21b1
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 9 deletions.
diff --git a/docs/changes.md b/docs/changes.md
@@ -1,5 +1,9 @@
 # dev
-Release date: `2017-??-??`
+Release date: `2018-??-??`
+
+
+# 3.0.4
+Release date: `2018-01-29`
 
 ### Core
 - [NXDRIVE-836](https://jira.nuxeo.com/browse/NXDRIVE-836): Bad behaviors with read-only documents
@@ -14,7 +18,7 @@ Release date: `2017-??-??`
 #### Minor changes
 - Framework: Review LocalWatcher class, better use of lock
 - GUI: Re-enable the possibility to uncheck a root in the filters window
-- Packaging: Upgraded `SIP` from 4.19.3 to 4.19.6
+- Packaging: Upgraded `SIP` from 4.19.3 to 4.19.7
 - Packaging: Updated `Js2Py` from 0.50 to 0.58
 - Packaging: Updated `markdown` from 2.6.10 to 2.6.11
 - Packaging: Updated `psutil` from 5.4.2 to 5.4.3

diff --git a/docs/technical_changes.md b/docs/technical_changes.md
@@ -3,8 +3,12 @@
 [//]: # (Note 3: keywords ordered [Added, Changed, Moved, Removed])
 
 # dev
+
+
+# 3.0.4
 - Removed `FsClient`
 - Removed `LocalWatcher.get_watchdog_queue_size()`
+- Added `Options.server_version`
 - Added `formatter` keyword to logging_config.py::`configure()`
 - Removed logging_config.py::`get_logger()`. Use `logging.getLogger(__name__)` instead.
 

diff --git a/nuxeo-drive-client/nxdrive/engine/engine.py b/nuxeo-drive-client/nxdrive/engine/engine.py
@@ -891,7 +891,9 @@ def get_local_client(self):
         return client
 
     def get_server_version(self):
-        return self._dao.get_config("server_version")
+        server_version = self._dao.get_config('server_version')
+        Options.set('server_version', server_version, setter='server')
+        return server_version
 
     @pyqtSlot()
     def invalidate_client_cache(self):

diff --git a/nuxeo-drive-client/nxdrive/options.py b/nuxeo-drive-client/nxdrive/options.py
@@ -141,6 +141,7 @@ class MetaOptions(type):
         'proxy_type': (None, 'default'),
         'quit_timeout': (-1, 'default'),
         'remote_repo': ('default', 'default'),
+        'server_version': (None, 'default'),
         'theme': ('ui5', 'default'),
         'startup_page': ('drive_login.jsp', 'default'),
         'stop_on_error': (True, 'default'),

diff --git a/nuxeo-drive-client/nxdrive/updater.py b/nuxeo-drive-client/nxdrive/updater.py
@@ -282,8 +282,9 @@ def _get_client_min_version(self, server_version):
             log.debug("Fetched client minimum version for server version %s"
                       " from %s: %s", server_version, url, version)
             return version
-        except HTTPError:
-            log.exception('Network error')
+        except HTTPError as exc:
+            if exc.code != 404:
+                log.exception('Network error')
             raise MissingUpdateSiteInfo(missing_msg)
         except URLError as e:
             self._handle_URL_error(e)

diff --git a/tools/checksums.txt b/tools/checksums.txt
@@ -17,5 +17,5 @@ f1962bfd4b668d42e12d5ed87b500788  cx_Freeze-4.3.3.zip
 fff688dc4968ec80bbb0eedf45de82db  python-2.7.14.msi
 
 # SIP
-6be5cb2c43915ed450a9f74ec110dada  sip-4.19.6.tar.gz
-6a4080268c2aa9225965415fe8706967  sip-4.19.6.zip
+ae4f2db79713046d61b2a44e5ee1e3ab  sip-4.19.7.tar.gz
+f8856b709eb92dfb9820d4234854922c  sip-4.19.7.zip
diff --git a/tools/posix/deploy_jenkins_slave.sh b/tools/posix/deploy_jenkins_slave.sh
@@ -94,7 +94,7 @@ check_vars() {
             export WORKSPACE_DRIVE="${WORKSPACE}"
         fi
     fi
-    export SIP_VERSION=${SIP_VERSION:=4.19.6}  # XXX: SIP_VERSION
+    export SIP_VERSION=${SIP_VERSION:=4.19.7}  # XXX: SIP_VERSION
     export CXFREEZE_VERSION=${CXFREEZE_VERSION:=4.3.3}  # XXX: CXFREEZE_VERSION
     export STORAGE_DIR="${WORKSPACE}/deploy-dir"
 

diff --git a/tools/windows/deploy_jenkins_slave.ps1 b/tools/windows/deploy_jenkins_slave.ps1
@@ -76,7 +76,7 @@ function check_vars {
 		}
 	}
 	if (-Not ($Env:SIP_VERSION)) {
-		$Env:SIP_VERSION = "4.19.6"  # XXX: SIP_VERSION
+		$Env:SIP_VERSION = "4.19.7"  # XXX: SIP_VERSION
 	}
 	if (-Not ($Env:CXFREEZE_VERSION)) {
 		$Env:CXFREEZE_VERSION = "4.3.3"  # XXX: CXFREEZE_VERSION