From 8c45429bacb128b1c6f2832eecb36ea1426d9436 Mon Sep 17 00:00:00 2001
From: Harco Kuppens <h.kuppens@cs.ru.nl>
Date: Fri, 28 Feb 2020 17:58:39 +0100
Subject: [PATCH] in setup.py use version from thonnycontrib/ev3dev/version.py

new version [1.0.4] - 2020-02-28

 ### Added
 - improved Options menu by adding label  "Warning: to use the simulated bluetooth in the simulator make sure you have PyBluez uninstalled!!"
 - improved Options menu for windows we only have option "show simulator
   fullscreen on second screen" because on windows for none fullscreen mode the
   simulator is always opened on the default screen.
 - improved Options menu for macos where we  only have two options "show simulator
   fullscreen" and "show simulator on second screen". Latter option is added because
   when dragging window to other screen sometimes messes up the resolution of
   the window. By drawing the window already at startup at the second screen
   prevents this problem.
 - improved Options menu by adding caption which explains the rpyc timeout you can configure under advanced options.
---
 CHANGELOG.md                    | 18 ++++++++++++++++++
 setup.py                        |  6 ++++--
 thonnycontrib/ev3dev/version.py |  2 +-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78636f2..15db486 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.4] - 2020-02-28
+
+ ### Added
+ - improved Options menu by adding label  "Warning: to use the simulated bluetooth in the simulator make sure you have PyBluez uninstalled!!"
+ - improved Options menu for windows we only have option "show simulator
+   fullscreen on second screen" because on windows for none fullscreen mode the
+   simulator is always opened on the default screen.
+ - improved Options menu for macos where we  only have two options "show simulator
+   fullscreen" and "show simulator on second screen". Latter option is added because
+   when dragging window to other screen sometimes messes up the resolution of
+   the window. By drawing the window already at startup at the second screen
+   prevents this problem.  
+ - improved Options menu by adding caption which explains the rpyc timeout you can configure under advanced options.
+
+ ### Fixed 
+ - fixed cleanup of files on EV3 by switching to new ev3devcmd library
+
+
 ## [1.0.3] - 2020-02-08
  
  ### Removed
diff --git a/setup.py b/setup.py
index 5a06b39..cc42374 100644
--- a/setup.py
+++ b/setup.py
@@ -2,13 +2,15 @@
 import os.path
 import sys
 
+from thonnycontrib.ev3dev.version import __version__ as pluginversion
+
 setupdir = os.path.dirname(__file__)
 
 
 
 setup(
       name="thonny-ev3dev",
-      version="1.0.3",
+      version=pluginversion,
       description="A plug-in which adds EV3 support for Thonny",
       long_description="""
 The thonny-ev3dev package is a plug-in which adds EV3 support for Thonny.
@@ -58,7 +60,7 @@
       keywords="IDE education programming EV3 mindstorms lego",
       platforms=["Windows", "macOS", "Linux"],
       python_requires=">=3.6",
-      install_requires=['ev3devcmd==1.0.1','ev3dev2simulator'],
+      install_requires=['ev3devcmd==1.0.2','ev3dev2simulator'],
       packages=["thonnycontrib.ev3dev"],
       package_data={'thonnycontrib.ev3dev': ['res/*']}
 )
diff --git a/thonnycontrib/ev3dev/version.py b/thonnycontrib/ev3dev/version.py
index 3f6fab6..8a81504 100644
--- a/thonnycontrib/ev3dev/version.py
+++ b/thonnycontrib/ev3dev/version.py
@@ -1 +1 @@
-__version__ = '1.0.3'
+__version__ = '1.0.4'