Update version; update github runner (ubuntu-20.04 -> ubuntu-22.04)

Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>
Ho-Ro · Jul 27, 2023 · c692226 · c692226
1 parent 8021a1a
commit c692226
Show file tree

Hide file tree

Showing 8 changed files with 1,008 additions and 1,008 deletions.
diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml
@@ -15,7 +15,7 @@ jobs:
   # This workflow contains a single job called "build_check"
   build_check:
     # The type of runner that the job will run on - needs ubuntu-20.04 to get a recent sdcc
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2023-07-27: Merge pull request #21 from f1rmb/fix_python_version_usage [8021a1a]
+2023-07-27: Make it work when 'python' is not available, but python3 is (like Ubuntu/Mint). [a36eade]
+2023-03-06: correct version [479c738]
 2023-03-06: correct ini file offset sign (same value as in EEPROM), fix comments [d25822d]
 2022-10-18: update build process, create OpenHantek6022 header file with FW version [01b82fd]
 2022-07-29: update README, add status badges [00a965f]

diff --git a/PyHT6022/Firmware/DDS120/dds120-firmware.hex b/PyHT6022/Firmware/DDS120/dds120-firmware.hex
diff --git a/PyHT6022/Firmware/DSO6021/dso6021-firmware.hex b/PyHT6022/Firmware/DSO6021/dso6021-firmware.hex
diff --git a/PyHT6022/Firmware/DSO6022BE/dso6022be-firmware.hex b/PyHT6022/Firmware/DSO6022BE/dso6022be-firmware.hex
diff --git a/PyHT6022/Firmware/DSO6022BL/dso6022bl-firmware.hex b/PyHT6022/Firmware/DSO6022BL/dso6022bl-firmware.hex
diff --git a/PyHT6022/Firmware/dso602x_fw_version.h b/PyHT6022/Firmware/dso602x_fw_version.h
@@ -6,7 +6,7 @@
 
 const uint16_t DSO602x_FW_VER = 0x0210;
 
-// setup.py: __version__ = '2.10.4'
+// setup.py: __version__ = '2.10.6'
 // PyHT6022/LibUsbScope.py: FIRMWARE_VERSION = 0x0210
 // PyHT6022/Firmware/DSO6022BE/descriptor.inc: FIRMWARE_VERSION = 0x1002
 
diff --git a/setup.py b/setup.py
@@ -1,14 +1,14 @@
 # Version is X.Y.Z = major.minor.update
 #
-# Keep major.minor in sync:
+# Keep major.minor in sync, ignore patch (used for deb version only):
 # - PyHT6022/Firmware/DSO6022BE/descriptor.inc
-#   Format: X.Y -> "FIRMWARE_VERSION = 0xYYXX"
+#   Format: XX.YY.ZZ -> "FIRMWARE_VERSION = 0xYYXX"
 # - PyHT6022/LibUsbScope.py
-#   Format: X.Y -> "FIRMWARE_VERSION = 0xXXYY"
+#   Format: XX.YY.ZZ -> "FIRMWARE_VERSION = 0xXXYY"
 #
 # Update also "const uint16_t DSO602x_FW_VER = 0xXXYY" in "OpenHantek6022/openhantek/res/firmware/dso602x_fw_version.h"
 
-__version__ = '2.10.5'
+__version__ = '2.10.6'
 
 
 from setuptools import setup