Updated version information for 0.6.0 release.

jetperch · Sep 16, 2019 · dd8feae · dd8feae
1 parent 62095f7
commit dd8feae
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,9 @@
 This file contains the list of changes made to pyjoulescope_ui.
 
 
-## 0.6.0-dev0
+## 0.6.0
 
-2019 ??? ??
+2019 Sep 16
 
 *   Added plugins and range_tool.  Refactored export & USB Inrush.
 *   Added histogram-based plugins (author Axel Jacobsen).

diff --git a/joulescope.iss b/joulescope.iss
@@ -6,8 +6,8 @@
 ; http://www.jrsoftware.org/ishelp/index.php?topic=setup_signtool
 
 #define MyAppName "Joulescope"
-#define MyAppVersion "0.6.0-dev0"
-#define MyAppVersionUnderscores "0_6_0-dev0"
+#define MyAppVersion "0.6.0"
+#define MyAppVersionUnderscores "0_6_0"
 #define MyAppPublisher "Jetperch LLC"
 #define MyAppURL "https://www.joulescope.com"
 #define MyAppExeName "joulescope.exe"

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 check-manifest>=0.37
 coverage>=4.5.2
 Cython>=0.29.3
-joulescope>=0.5.1  # also update JOULESCOPE_VERSION_MIN in setup.py
+joulescope>=0.6.0  # also update JOULESCOPE_VERSION_MIN in setup.py
 json5>=0.6.1
 numpy>=1.15.2
 pypiwin32>=223; sys_platform == 'win32'
@@ -14,4 +14,4 @@ wheel
 # Include forked pyqtgraph (source https://github.com/jetperch/pyqtgraph)
 # https://www.joulescope.com/app_download/pyqtgraph-0.11.0.dev1.tar.gz
 # pyqtgraph>=0.11.0.dev1
--e git+https://github.com/jetperch/pyqtgraph.git@cb01a73910db6a366467259fba89d00319b9d6ac#egg=pyqtgraph-0.11.0.dev1
+-e git+https://github.com/jetperch/pyqtgraph.git@d88af7ebb2c1c8d61a3b33271f2e103ce0c1c233#egg=pyqtgraph-0.11.0.dev1
diff --git a/setup.py b/setup.py
@@ -32,8 +32,8 @@
 import shutil
 
 
-VERSION = '0.6.0-dev0'  # CHANGE THIS VERSION!
-JOULESCOPE_VERSION_MIN = '0.5.1'  # also update requirements.txt
+VERSION = '0.6.0'  # CHANGE THIS VERSION!
+JOULESCOPE_VERSION_MIN = '0.6.0'  # also update requirements.txt
 MYPATH = os.path.abspath(os.path.dirname(__file__))
 VERSION_PATH = os.path.join(MYPATH, 'joulescope_ui', 'version.py')
 
@@ -191,7 +191,7 @@ def run(self):
         'python-dateutil>=2.7.3',
         'pyside2>=5.13.0',
         # 'pyqtgraph>=0.11.0', eventually, but PEP 508 URL for now:
-        'pyqtgraph @ https://github.com/jetperch/pyqtgraph/tarball/cb01a73910db6a366467259fba89d00319b9d6ac#egg=pyqtgraph-0.11.0.dev1',
+        'pyqtgraph @ https://github.com/jetperch/pyqtgraph/tarball/d88af7ebb2c1c8d61a3b33271f2e103ce0c1c233#egg=pyqtgraph-0.11.0.dev1',
         'requests>=2.0.0',
         'joulescope>=' + JOULESCOPE_VERSION_MIN,
     ] + PLATFORM_INSTALL_REQUIRES,