Merge c00990f into 540a6de

.github/workflows/ci.yml

@@ -0,0 +1,33 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python: [3.5, 3.6, 3.7, 3.8]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python }}
+      - name: Install Dependencies
+        run: |
+          sudo apt-get update; sudo apt-get install lzop xz-utils gzip
+          pip install tox coveralls
+      - name: Run Tox
+        run: tox -e py
+      - name: Coverage
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+        run: coveralls
+

README.md

@@ -1,4 +1,9 @@
-# uhu - UpdateHub Utilities [![Build Status](https://travis-ci.org/UpdateHub/uhu.svg?branch=master)](https://travis-ci.org/UpdateHub/uhu) [![Coverage Status](https://coveralls.io/repos/github/UpdateHub/uhu/badge.svg?branch=master)](https://coveralls.io/github/UpdateHub/uhu?branch=master)
+![Tests](https://github.com/UpdateHub/uhu/workflows/CI/badge.svg)
+[![Coverage Status](https://coveralls.io/repos/github/UpdateHub/uhu/badge.svg?branch=master)](https://coveralls.io/github/UpdateHub/uhu?branch=master)
+[![PyPI](https://img.shields.io/pypi/v/uhu)](https://pypi.python.org/pypi/uhu/)
+[![PyPI - Supported Python Versions](https://img.shields.io/pypi/pyversions/uhu)](https://pypi.python.org/pypi/uhu/)
+
+# uhu - UpdateHub Utilities
 
 uhu is an interactive prompt and a command line utility to manage update
 packages for [UpdateHub](https://github.com/UpdateHub/updatehub) agent.

pytest.ini

@@ -0,0 +1,3 @@
+[pytest]
+junit_family=xunit1
+filterwarnings = ignore:.*pep8.*

setup.cfg

@@ -0,0 +1,28 @@
+[metadata]
+name = uhu
+description = "UpdateHub's firmware update package management utilities"
+long_description = file: README.md
+long_description_content_type = text/markdown
+keywords=industrial-linux, embedded-linux, embedded, firmware-updates, linux, update-service
+author = O.S. Systems Software LTDA
+author_mail = contato@ossystems.com.br
+url = http://www.ossystems.com.br
+license = GPL-2.0
+
+[options]
+zip_safe = False
+python_requires = >=3.4
+install_requires =
+    click >= 6.5
+    humanize >= 0.5.1
+    progress >= 1.1
+    prompt-toolkit >=2.0.0, <3.0.0
+    pycryptodomex
+    requests >= 2.20.0
+    rfc3987 >= 1.3
+    updatehub-package-schema >= 1.0.3
+
+[options.entry_points]
+console_scripts =
+    uhu=uhu.cli:cli
+

setup.py

@@ -5,29 +5,7 @@
 
 from uhu import get_version
 
-
 setup(
-    name='uhu',
-    description="UpdateHub's firmware update package management utilities",
-    keywords='industrial-linux embedded-linux embedded firmware-updates linux update-service',  # nopep8
     version=get_version(),
     packages=find_packages(exclude=['tests*']),
-    entry_points={
-        'console_scripts': ['uhu=uhu.cli:cli']
-    },
-    install_requires=[
-        'click>=6.5',
-        'humanize>=0.5.1',
-        'progress>=1.1',
-        'prompt-toolkit>=2.0.0,<3.0.0',
-        'pycrypto',
-        'updatehub-package-schema>=1.0.3',
-        'requests>=2.20.0',
-        'rfc3987>=1.3',
-    ],
-    author='O.S. Systems Software LTDA',
-    author_email='contato@ossystems.com.br',
-    url='http://www.ossystems.com.br',
-    license='GPL-2.0',
-    zip_safe=False,
 )

tests/core/test_package.py

@@ -8,9 +8,9 @@
 import unittest
 from unittest.mock import patch
 
-from Crypto.PublicKey import RSA
-from Crypto.Hash import SHA256
-from Crypto.Signature import PKCS1_v1_5
+from Cryptodome.PublicKey import RSA
+from Cryptodome.Hash import SHA256
+from Cryptodome.Signature import PKCS1_v1_5
 from pkgschema import ValidationError
 
 from uhu.core.hardware import SupportedHardwareManager

tests/test_utils.py

@@ -9,9 +9,9 @@
 import unittest
 from unittest.mock import patch
 
-from Crypto.Hash import SHA256
-from Crypto.PublicKey import RSA
-from Crypto.Signature import PKCS1_v1_5
+from Cryptodome.Hash import SHA256
+from Cryptodome.PublicKey import RSA
+from Cryptodome.Signature import PKCS1_v1_5
 
 from uhu import utils
 

tox.ini

@@ -1,20 +1,21 @@
 [tox]
-envlist = py34, py35, py36
+envlist = py35, py36, py37, py38
 
 [testenv]
 deps =
-    pylint==1.7.*
-    pytest==2.9.1
-    pytest-cov==2.2.1
-    pytest-pep8==1.0.6
+    pylint==2.4.*
+    pytest==5.4.*
+    pytest-pep8==1.0.*
+    pytest-cov==2.5.*
     requests>=2
-    pycrypto==2.6.1
+    pycryptodomex==3.9.*
 commands =
     py.test \
         --cov={envsitepackagesdir}/uhu \
-        --cov-report=xml \
         --cov-report=term-missing \
         --junitxml=test-report.xml \
         --pep8 \
         {posargs}
-    pylint uhu
+    pylint \
+           -d R1710 \
+           uhu

uhu/core/_object.py

@@ -25,7 +25,7 @@ def get(cls, name):
 
     @classmethod
     def names(cls):
-        return sorted([mode for mode in cls.registry])
+        return sorted(list(cls.registry))
 
 
 class ObjectType(type):

uhu/core/_options.py

@@ -16,7 +16,7 @@ def get(cls, name):
 
     @classmethod
     def all(cls):
-        return [option for option in cls.registry.values()]
+        return list(cls.registry.values())
 
 
 class OptionType(type):

uhu/core/install_condition.py

@@ -178,9 +178,9 @@ def get_version(fn, type_, **kwargs):
     with open(fn, 'rb') as fp:
         if type_ == 'linux-kernel':
             return get_kernel_version(fp)
-        elif type_ == 'u-boot':
+        if type_ == 'u-boot':
             return get_uboot_version(fp)
-        elif type_ == 'regexp':
+        if type_ == 'regexp':
             kwargs = {k: v for k, v in kwargs.items() if v is not None}
             return get_object_version(fp, **kwargs)
 
@@ -249,9 +249,9 @@ def __init__(self, metadata):
     def to_metadata(self):
         if self.condition == self.CONTENT_DIVERGES:
             return self._format_metadata('sha256sum')
-        elif self.condition == self.VERSION_DIVERGES:
+        if self.condition == self.VERSION_DIVERGES:
             return self._metadata_version_diverges()
-        elif self.condition == self.ALWAYS:
+        if self.condition == self.ALWAYS:
             return {}
         raise ValueError('Invalid install-condition condition.')
 
@@ -260,7 +260,7 @@ def _metadata_version_diverges(self):
             'install-condition-pattern-type', None)
         if self.pattern in KNOWN_PATTERNS:
             return self._metadata_known_pattern()
-        elif self.pattern == CUSTOM_PATTERN:
+        if self.pattern == CUSTOM_PATTERN:
             return self._metadata_custom_pattern()
         raise ValueError('Unknown install-condition pattern type.')
 

uhu/core/object.py

@@ -6,7 +6,7 @@
 from ._object import Modes
 
 
-class Object:  # pylint: disable=too-few-public-methods
+class Object:  # pylint: disable=too-few-public-methods, self-cls-assignment
 
     def __new__(cls, options):
         opts = deepcopy(options)

uhu/core/objects.py

@@ -182,4 +182,3 @@ def _objects_to_str(objects):
 
 class DuplicateObjectEntryError(Exception):
     """Exception raised upon an attempt to add an existing package."""
-    pass

uhu/core/options.py

@@ -216,9 +216,9 @@ class InstallConditionOption(StringOption):
     def humanize(cls, value):
         if value == 'always':
             return 'always install'
-        elif value == 'content-diverges':
+        if value == 'content-diverges':
             return 'install when CONTENT diverges'
-        elif value == 'version-diverges':
+        if value == 'version-diverges':
             return 'install when VERSION diverges'
 
 

uhu/core/utils.py

@@ -11,6 +11,8 @@
 from ..config import config
 from ..utils import sign_dict
 
+from .package import Package
+
 
 def dump_package(package, fn):
     """Dumps a package into a file."""
@@ -21,7 +23,6 @@ def dump_package(package, fn):
 
 def load_package(fn):
     """Loads a package from package dump file."""
-    from .package import Package
     with open(fn) as fp:
         dump = json.load(fp, object_pairs_hook=OrderedDict)
     return Package(dump=dump)

uhu/repl/exceptions.py

@@ -6,7 +6,6 @@
 
 class CancelPromptException(Exception):
     """Exception that must be raised when user types Ctrl C."""
-    pass
 
 
 class ValidationError(ValidationError):  # pylint: disable=function-redefined

uhu/repl/helpers.py

@@ -211,11 +211,11 @@ def _get_object_option_value_completer(option, obj=None):
     """Retuns a completer for object_option_value prompt."""
     if option.choices:
         return ObjectOptionValueCompleter(option)
-    elif option.type_name == 'boolean':
+    if option.type_name == 'boolean':
         return YesNoCompleter()
-    elif option.metadata == 'filename':
+    if option.metadata == 'filename':
         return ObjectFilenameCompleter()
-    elif option.metadata == 'target-type':
+    if option.metadata == 'target-type':
         return WordCompleter(obj.target_types)
 
 
@@ -255,7 +255,7 @@ def prompt_installation_set(package, msg=None):
     if package.objects.is_single():
         return None
 
-    objects = [(index, objs) for index, objs in enumerate(package.objects)]
+    objects = list(enumerate(package.objects))
     indexes = [str(i) for i, _ in objects]
 
     msg = msg if msg is not None else 'Select an installation set: '

uhu/updatehub/http.py

@@ -37,7 +37,7 @@ def request(method, url, *args, sign=True, **kwargs):
         raise HTTPError(UNKNOWN_ERROR)
     if response.status_code == 401:
         raise HTTPError('Unautorized. Did you set your credentials?')
-    elif not response.ok:
+    if not response.ok:
         raise HTTPError(format_server_error(response))
     return response
 

uhu/utils.py

@@ -5,9 +5,9 @@
 import json
 import os
 
-from Crypto.Hash import SHA256
-from Crypto.PublicKey import RSA
-from Crypto.Signature import PKCS1_v1_5
+from Cryptodome.Hash import SHA256
+from Cryptodome.PublicKey import RSA
+from Cryptodome.Signature import PKCS1_v1_5
 
 
 # Environment variables