Merge pull request #26 from makermelissa/master

Fix for click 8.0.0
adafruit · May 18, 2021 · fd00af3 · fd00af3
2 parents 9c66aa3 + c9d4ebf
commit fd00af3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/nordicsemi/__main__.py b/nordicsemi/__main__.py
@@ -46,6 +46,7 @@ class nRFException(Exception):
 
 
 def int_as_text_to_int(value):
+    value = str(value)
     try:
         if value[:2].lower() == '0x':
             return int(value[2:], 16)
@@ -60,6 +61,7 @@ class BasedIntOrNoneParamType(click.ParamType):
     name = 'Int or None'
 
     def convert(self, value, param, ctx):
+        value = str(value)
         try:
             if value.lower() == 'none':
                 return 'none'

diff --git a/nordicsemi/version.py b/nordicsemi/version.py
@@ -30,4 +30,4 @@
 
 """ Version definition for nrfutil. """
 
-NRFUTIL_VERSION = "0.5.3.post15"
+NRFUTIL_VERSION = "0.5.3.post16"
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
     pyserial >= 2.7
-    click == 7.1.2
+    click >= 5.1
     ecdsa >= 0.13
     behave
diff --git a/setup.py b/setup.py
@@ -104,7 +104,7 @@ def run_tests(self):
     include_package_data=False,
     install_requires=[
         "pyserial >= 2.7",
-        "click == 7.1.2",
+        "click >= 5.1",
         "ecdsa >= 0.13",
     ],
     tests_require=[