Merge pull request ojarva#75 from ojarva/ojarva-fix-ci

Migrate from travis to more reliable github actions

Author: ojarva

.github/workflows/python-tests.yml

@@ -0,0 +1,39 @@
+name: Run python tests
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.6, 3.7, 3.8]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install pycodestyle isort pylint yapf
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Check import sorting
+      run: |
+        isort --diff --check --recursive sshpubkeys tests
+    - name: Check pycodestyle
+      run: |
+        pycodestyle --ignore E501,E402 --exclude=.git,dev3 sshpubkeys tests
+    - name: Run pylint
+      run: |
+        pylint sshpubkeys tests
+    - name: Run tests
+      run: |
+        python3 setup.py test
+    - name: Check formatting
+      run: |
+        isort --recursive sshpubkeys tests; yapf --recursive .
+        git diff --exit-code  # This fails if isort&yapf combo made any changes

.travis.yml

@@ -23,10 +23,9 @@
         'Topic :: Security',
         'License :: OSI Approved :: BSD License',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: Implementation :: PyPy',
     ],
     keywords='ssh pubkey public key openssh ssh-rsa ssh-dss ssh-ed25519',

setup.py

@@ -170,8 +170,8 @@ def _unpack_by_int(self, data, current_position):
         # Unpack length of data field
         try:
             requested_data_length = struct.unpack('>I', data[current_position:current_position + self.INT_LEN])[0]
-        except struct.error:
-            raise MalformedDataError("Unable to unpack %s bytes from the data" % self.INT_LEN)
+        except struct.error as ex:
+            raise MalformedDataError("Unable to unpack %s bytes from the data" % self.INT_LEN) from ex
 
         # Move pointer to the beginning of the data field
         current_position += self.INT_LEN
@@ -240,8 +240,8 @@ def decode_key(cls, pubkey_content):
         """Decode base64 coded part of the key."""
         try:
             decoded_key = base64.b64decode(pubkey_content.encode("ascii"))
-        except (TypeError, binascii.Error):
-            raise MalformedDataError("Unable to decode the key")
+        except (TypeError, binascii.Error) as ex:
+            raise MalformedDataError("Unable to decode the key") from ex
         return decoded_key
 
     @classmethod
@@ -363,8 +363,8 @@ def _process_ecdsa_sha(self, data):
         try:
             # data starts with \x04, which should be discarded.
             ecdsa_key = ecdsa.VerifyingKey.from_string(key_data[1:], curve, hash_algorithm)
-        except AssertionError:
-            raise InvalidKeyError("Invalid ecdsa key")
+        except AssertionError as ex:
+            raise InvalidKeyError("Invalid ecdsa key") from ex
         self.bits = int(curve_information.replace(b"nistp", b""))
         self.ecdsa = ecdsa_key
         return current_position