Pinned dependency versions

.devcontainer/devcontainer.json

@@ -0,0 +1,13 @@
+{
+    "build": {
+        "dockerfile": "dev.Dockerfile"
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "scheiblingco.code-pypack",
+                "scheiblingco.code-cmd-repeat"
+            ]
+        }
+    }
+}

.github/workflows/linting.yml

@@ -23,12 +23,11 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install pylint pylint-report pylint-json2html
+          pip install -r requirements-test.txt
 
       - name: Run tests
         run: |
-          pylint src/sshkey_tools | tee | pylint-json2html -o report.html
+          python3 -m pylint src/sshkey_tools | tee | pylint_report -o report.html
 
       - name: Upload report
         uses: actions/upload-artifact@v1

.pylintrc

@@ -1,2 +1,6 @@
+[MASTER]
+load-plugins=pylint_report
+extension-pkg-allow-list=cryptography.hazmat.bindings._rust
+
 [REPORTS]
-output-format=json
+output-format=pylint_report.CustomJsonReporter

Pipfile

@@ -0,0 +1,25 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+click = ">=7.1"
+cryptography = ">=41.0"
+bcrypt = ">=4.0"
+enum34 = ">=1.1"
+prettytable = ">=3.1"
+pytimeparse2 = ">=1.4"
+
+[dev-packages]
+pylint-report = "*"
+paramiko = "*"
+coverage = "*"
+black = "*"
+pytest-cov = "*"
+faker = "*"
+cprint = "*"
+pylint = "*"
+
+[requires]
+python_version = "3.9"

dev.Dockerfile

@@ -0,0 +1,7 @@
+FROM mcr.microsoft.com/devcontainers/universal:2
+
+RUN curl https://pyenv.run | bash \
+    && echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc \
+    && echo 'command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc \
+    && echo 'eval "$(pyenv init -)"' >> ~/.bashrc
+

requirements-test.txt

@@ -4,4 +4,6 @@ coverage
 black
 pytest-cov
 faker
-cprint
+cprint
+pylint
+pylint-report

requirements.txt

@@ -1,6 +1,6 @@
-click
-cryptography
-bcrypt
-enum34
-PrettyTable
-pytimeparse2
+click>=7.1
+cryptography>=41.0
+bcrypt>=4.0
+enum34>=1.1
+PrettyTable>=3.1
+pytimeparse2>=1.4

src/sshkey_tools/__version__.py

@@ -9,7 +9,7 @@
 
 # The version and build number
 # Without specifying a unique number, you cannot overwrite packages in the PyPi repo
-__version__ = os.getenv("RELEASE_NAME", "0.9-dev" + os.getenv("GITHUB_RUN_ID", ""))
+__version__ = os.getenv("RELEASE_NAME", "0.10.2-dev" + os.getenv("GITHUB_RUN_ID", ""))
 
 # Author and license information
 __author__ = "Lars Scheibling"

src/sshkey_tools/cert.py

@@ -8,7 +8,6 @@
     _EX.NoPrivateKeyException: The certificate contains no private key
     _EX.NotSignedException: The certificate is not signed and cannot be exported
 """
-import warnings
 from base64 import b64decode, b64encode
 from dataclasses import dataclass
 from typing import Tuple, Union
@@ -578,11 +577,13 @@ class RsaCertificate(SSHCertificate):
 
 class DsaCertificate(SSHCertificate):
     """The DSA Certificate class (DEPRECATED)"""
-
+
+    # pylint: disable=super-init-not-called
     def __init__(self, *args, **kwargs):
         """DEPRECATED CERTIFICATE CLASS"""
         raise _EX.DeprecatedClassCalled(
-            "DSA certificates are deprecated and have been removed since version 0.10 of sshkey-tools"
+            "DSA certificates are deprecated and have been removed"
+            "since version 0.10 of sshkey-tools"
         )
 
 

src/sshkey_tools/exceptions.py

@@ -108,7 +108,8 @@ class InvalidClassCallException(ValueError):
     Raised when trying to instantiate a parent class
     """
 
+
 class DeprecatedClassCalled(ValueError):
     """
     Raised when trying to instantiate a deprecated class
-    """
+    """

src/sshkey_tools/fields.py

@@ -485,10 +485,10 @@ def parse_string_value(value: str) -> int:
         """
         if value == "forever":
             return MAX_INT64 - 1
-        
+
         if value == "always":
             return 1
-        
+
         return int((datetime.now() + str_to_time_delta(value)).timestamp())
 
     @staticmethod
@@ -516,7 +516,7 @@ def __validate_value__(self) -> Union[bool, Exception]:
         check = self.value
         if isinstance(check, str):
             check = self.parse_string_value(check)
-        
+
         if isinstance(check, datetime):
             check = int(check.timestamp())
 
@@ -1071,15 +1071,14 @@ def __validate_value__(self) -> Union[bool, Exception]:
             )
 
         super().__validate_value__()
-        
+
         check = self.value
         if isinstance(check, str):
             check = self.parse_string_value(check)
-        
+
         if isinstance(check, datetime):
             check = int(check.timestamp())
-
-
+
         if check < int(datetime.now().timestamp()):
             return _EX.InvalidCertificateFieldException(
                 "The certificate validity period is invalid"
@@ -1479,13 +1478,14 @@ class DsaSignatureField(SignatureField):
     Creates and contains the DSA signature from an DSA Private Key
     """
 
+    # pylint: disable=super-init-not-called
     def __init__(self, *args, **kwargs) -> None:
         raise _EX.DeprecatedClassCalled(
             "DSA signatures are deprecated and have been removed"
         )
 
     @classmethod
-    def encode(cls, value = None):
+    def encode(cls, value=None):
         """
         Encodes the signature to a byte string
 
@@ -1498,13 +1498,14 @@ def encode(cls, value = None):
         cls()
 
     @staticmethod
-    def decode(data = None):
-       DsaSignatureField()
+    def decode(data=None):
+        DsaSignatureField()
 
     @classmethod
-    def from_decode(cls, data = None):
+    def from_decode(cls, data=None):
         cls()
 
+
 class EcdsaSignatureField(SignatureField):
     """
     Creates and contains the ECDSA signature from an ECDSA Private Key

src/sshkey_tools/keys.py

@@ -1,7 +1,6 @@
 """
 Classes for handling SSH public/private keys
 """
-import warnings
 from base64 import b64decode
 from enum import Enum
 from struct import unpack
@@ -594,29 +593,34 @@ class DsaPublicKey(PublicKey):
     Class for holding DSA public keys
     """
 
-    def __init__(self, key = None, comment = None, key_type = None, serialized = None):
+    # pylint: disable=super-init-not-called
+    def __init__(self, key=None, comment=None, key_type=None, serialized=None):
         raise _EX.DeprecatedClassCalled(
-            "SSH DSA keys and certificates are deprecated and are removed since version 0.10 of sshkey-tools",
+            "SSH DSA keys and certificates are deprecated "
+            "and are removed since version 0.10 of sshkey-tools",
         )
-    
+
     @classmethod
-    # pylint: disable=invalid-name
+    # pylint: disable=invalid-name,unused-argument
     def from_numbers(cls, p: int, q: int, g: int, y: int) -> "DsaPublicKey":
+        """Deprecated"""
         return cls()
 
-    
+
 class DsaPrivateKey(PrivateKey):
     """
     Class for holding DSA private keys
     """
 
-    def __init__(self, key = None):
+    # pylint: disable=super-init-not-called
+    def __init__(self, key=None):
         raise _EX.DeprecatedClassCalled(
-            "SSH DSA keys and certificates are deprecated and are removed since version 0.10 of sshkey-tools",
+            "SSH DSA keys and certificates are deprecated "
+            "and are removed since version 0.10 of sshkey-tools",
         )
 
     @classmethod
-    # pylint: disable=invalid-name,too-many-arguments
+    # pylint: disable=invalid-name,too-many-arguments,unused-argument
     def from_numbers(cls, p, q, g, y, x):
         """
         Creates a new DsaPrivateKey object from parameters and public/private numbers
@@ -632,7 +636,7 @@ def from_numbers(cls, p, q, g, y, x):
             _type_: _description_
         """
         return cls()
-    
+
     @classmethod
     def generate(cls) -> "DsaPrivateKey":
         """
@@ -644,6 +648,7 @@ def generate(cls) -> "DsaPrivateKey":
         """
         return cls()
 
+
 class EcdsaPublicKey(PublicKey):
     """
     Class for holding ECDSA public keys