Merge pull request #256 from SamSchott/develop

Release v1.3.1

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.3.0
+current_version = 1.3.1
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<build>\d+))?

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.3.1
+
+#### Fixes:
+
+* Fixes an incorrect entry point for the Qt GUI.
+
 ## v1.3.0
 
 This release features an overhaul of the command line interface: commands are grouped

docs/conf.py

@@ -11,7 +11,7 @@
 # -- Project information ---------------------------------------------------------------
 
 author = "Sam Schott"
-version = "1.3.0"
+version = "1.3.1"
 release = version
 project = "Maestral"
 title = "Maestral API Documentation"

setup.py

@@ -29,7 +29,7 @@
 ]
 
 gui_requires = [
-    "maestral-qt>=1.3.0;sys_platform=='linux'",
+    "maestral-qt>=1.3.1;sys_platform=='linux'",
     "maestral-cocoa>=1.3.0;sys_platform=='darwin'",
 ]
 
@@ -56,7 +56,7 @@
     name="maestral",
     author="Sam Schott",
     author_email="ss2151@cam.ac.uk",
-    version="1.3.0",
+    version="1.3.1",
     url="https://github.com/SamSchott/maestral",
     description="Open-source Dropbox client for macOS and Linux.",
     license="MIT",

src/maestral/__init__.py

@@ -14,7 +14,7 @@
 
 import warnings
 
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __author__ = "Sam Schott"
 __url__ = "https://github.com/SamSchott/maestral"
 

src/maestral/daemon.py

@@ -535,7 +535,7 @@ def start_maestral_daemon_process(
     Starts the Maestral daemon in a new process by calling :func:`start_maestral_daemon`.
     Startup is race free: there will never be two daemons running for the same config.
     This function requires that :obj:`sys.executable` points to a Python executable and
-    therefore may not work "frozen" apps.
+    therefore may not work for "frozen" apps.
 
     :param config_name: The name of the Maestral configuration to use.
     :param log_to_stdout: If ``True``, write logs to stdout.
@@ -597,7 +597,7 @@ def stop_maestral_daemon_process(
     :param config_name: The name of the Maestral configuration to use.
     :param timeout: Number of sec to wait for daemon to shut down before killing it.
     :returns: :attr:`Stop.Ok` if successful, :attr:`Stop.Killed` if killed,
-        :attr:`Stop.NotRunning` if the daemon was not running and `:attr:`Stop.Failed`
+        :attr:`Stop.NotRunning` if the daemon was not running and :attr:`Stop.Failed`
         if killing the process failed because we could not retrieve its PID.
     """
 

src/maestral/logging.py

@@ -22,6 +22,14 @@
 from .utils import sanitize_string
 
 
+__all__ = [
+    "EncodingSafeLogRecord",
+    "CachedHandler",
+    "SdNotificationHandler",
+    "safe_journal_sender",
+]
+
+
 if journal:
 
     def safe_journal_sender(MESSAGE: str, **kwargs) -> None:
@@ -46,7 +54,7 @@ class EncodingSafeLogRecord(logging.LogRecord):
 
     This is useful when log messages may contain file paths generates by OS APIs. In
     Python, such path strings may contain surrogate escapes and will therefore raise
-    :class:`UnicodeEncodingError`s under many circumstances (printing to stdout, etc).
+    a :class:`UnicodeEncodeError` under many circumstances (printing to stdout, etc).
     """
 
     def getMessage(self) -> str:
@@ -101,7 +109,7 @@ def wait_for_emit(self, timeout: Optional[float]) -> bool:
         Blocks until a new record is emitted.
 
         :param timeout: Maximum time to block before returning.
-        :returns: ``True``if there was a status change, ``False`` in case of a timeout.
+        :returns: ``True`` if there was a status change, ``False`` in case of a timeout.
         """
         done, not_done = wait([self._emit_future], timeout=timeout)
         self._emit_future = Future()  # reset future
@@ -135,8 +143,6 @@ class SdNotificationHandler(logging.Handler):
 
     This is useful when used from a systemd service and will do nothing when no
     NOTIFY_SOCKET is provided.
-
-    :param level: Initial log level. Defaults to NOTSET.
     """
 
     notifier = sdnotify.SystemdNotifier()