Browse Source

fixx missing dependency on wrapt

Peter Magnusson 6 years ago
parent
commit
d661fac497
4 changed files with 5 additions and 8 deletions
  1. 1 5
      nodemcu_uploader/utils.py
  2. 1 1
      nodemcu_uploader/version.py
  3. 2 1
      setup.py
  4. 1 1
      tests/misc.py

+ 1 - 5
nodemcu_uploader/utils.py

@@ -7,7 +7,7 @@ from os import environ
 from wrapt import ObjectProxy
 from wrapt import ObjectProxy
 from sys import version_info
 from sys import version_info
 
 
-__all__ = ['default_port', 'system']
+__all__ = ['default_port', 'system', 'hexify', 'from_file', 'wrap', 'PY2', 'ENCODING']
 
 
 PY2 = version_info.major == 2
 PY2 = version_info.major == 2
 
 
@@ -23,10 +23,6 @@ def default_port(sysname=system()):
     return environ.get('SERIALPORT', system_default)
     return environ.get('SERIALPORT', system_default)
 
 
 
 
-def bytefy(x):
-    return x if type(x) == bytes else x.encode(ENCODING)
-
-
 def to_hex(x):
 def to_hex(x):
     return hex(ord(x))
     return hex(ord(x))
 
 

+ 1 - 1
nodemcu_uploader/version.py

@@ -3,4 +3,4 @@
 """just keeper of current version"""
 """just keeper of current version"""
 
 
 #TODO: remember to update tests when version changes
 #TODO: remember to update tests when version changes
-__version__ = '0.4.2'
+__version__ = '0.4.3'

+ 2 - 1
setup.py

@@ -9,7 +9,8 @@ exec(open('nodemcu_uploader/version.py').read()) #pylint: disable=W0122
 setup(name='nodemcu-uploader',
 setup(name='nodemcu-uploader',
       version=__version__, #pylint: disable=E0602
       version=__version__, #pylint: disable=E0602
       install_requires=[
       install_requires=[
-          'pyserial>=2.7'
+          'pyserial>=2.7',
+          'wrapt>=1.10.10'
       ],
       ],
       packages=['nodemcu_uploader'],
       packages=['nodemcu_uploader'],
       #package_dir={'nodemcu_uploader': 'lib'},
       #package_dir={'nodemcu_uploader': 'lib'},

+ 1 - 1
tests/misc.py

@@ -8,7 +8,7 @@ import os
 class MiscTestCase(unittest.TestCase):
 class MiscTestCase(unittest.TestCase):
 
 
     def test_version(self):
     def test_version(self):
-        self.assertEqual(__version__, '0.4.2')
+        self.assertEqual(__version__, '0.4.3')
 
 
     def test_default_port(self):
     def test_default_port(self):
         if os.environ.get('SERIALPORT', 'none') != 'none':
         if os.environ.get('SERIALPORT', 'none') != 'none':