Fix up CI issues (#167)

jborean93 · Mar 6, 2023 · bfea572 · bfea572
1 parent 8c29f46
commit bfea572
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 18 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,16 +1,16 @@
 repos:
 - repo: https://github.com/psf/black
-  rev: 22.10.0
+  rev: 23.1.0
   hooks:
   - id: black
 
 - repo: https://github.com/PyCQA/isort
-  rev: 5.10.1
+  rev: 5.11.5
   hooks:
   - id: isort
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v0.991
+  rev: v1.0.1
   hooks:
   - id: mypy
     additional_dependencies:

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,11 +1,11 @@
 asyncssh
-black == 22.10.0
+black == 23.1.0
 build
 gssapi ; sys_platform != 'win32'
 krb5 ; sys_platform != 'win32'
 httpx[socks]
-isort == 5.10.1
-mypy == 0.991
+isort == 5.11.5
+mypy == 1.0.1
 pre-commit
 psutil
 pytest

diff --git a/src/psrp/_client.py b/src/psrp/_client.py
@@ -422,7 +422,6 @@ def _get_pwsh_script(
     block_comment = False
     new_lines = []
     for line in script.splitlines():
-
         line = line.strip()
         if block_comment:
             block_comment = not line.endswith("#>")

diff --git a/src/psrp/_io/wsman.py b/src/psrp/_io/wsman.py
@@ -220,7 +220,6 @@ def __post_init__(
             object.__setattr__(self, "connection_uri", server)
             scheme = raw_url.scheme
         else:
-
             try:
                 address = ipaddress.IPv6Address(server)
             except ipaddress.AddressValueError:
@@ -435,7 +434,7 @@ async def _handle_async_auth(
     ) -> httpx.Response:
         headers = request.headers.copy()
         stream: t.Union[bytes, httpx.AsyncByteStream, httpx.SyncByteStream] = request.stream
-        ext = request.extensions.copy()
+        ext = t.cast(dict, request.extensions).copy()
         if "trace" in ext:
             trace_func = functools.partial(self.trace, trace=ext["trace"])
             ext["trace"] = trace_func
@@ -729,7 +728,7 @@ def _handle_sync_auth(
     ) -> httpx.Response:
         headers = request.headers.copy()
         stream: t.Union[bytes, httpx.AsyncByteStream, httpx.SyncByteStream] = request.stream
-        ext = request.extensions.copy()
+        ext = t.cast(dict, request.extensions).copy()
         if "trace" in ext:
             trace_func = functools.partial(self.trace, trace=ext["trace"])
             ext["trace"] = trace_func

diff --git a/src/pypsrp/_utils.py b/src/pypsrp/_utils.py
@@ -107,7 +107,6 @@ def get_pwsh_script(name: str) -> str:
     block_comment = False
     new_lines = []
     for line in script.splitlines():
-
         line = line.strip()
         if block_comment:
             block_comment = not line.endswith("#>")

diff --git a/src/pypsrp/encryption.py b/src/pypsrp/encryption.py
@@ -10,7 +10,6 @@
 
 
 class WinRMEncryption(object):
-
     SIXTEEN_KB = 16384
     MIME_BOUNDARY = "--Encrypted Boundary"
     CREDSSP = "application/HTTP-CredSSP-session-encrypted"

diff --git a/tests/tests_pypsrp/test_complex_objects.py b/tests/tests_pypsrp/test_complex_objects.py
@@ -45,7 +45,6 @@ def test_enum_invalid_value(self):
 
 
 class TestHostInfo(object):
-
     HOST_XML = """<Obj RefId="0">
             <MS>
                 <Obj N="_hostDefaultData" RefId="1">
@@ -239,7 +238,6 @@ def test_to_string_multiple_values(self):
 
 
 class TestPipeline(object):
-
     PIPE_SINGLE = """<Obj RefId="0">
         <MS>
             <B N="IsNested">false</B>
@@ -772,7 +770,6 @@ def test_to_string_null(self):
 
 
 class TestBufferCell(object):
-
     BUFFER_CELL = """<Obj RefId="0">
     <Props>
         <C N="character">65</C>
@@ -822,7 +819,6 @@ def test_parse_buffer_cell(self):
 
 
 class TestArray(object):
-
     SINGLE_ARRAY = """<Obj RefId="0">
     <MS>
         <Obj N="mae" RefId="1">

diff --git a/tests/tests_pypsrp/test_host.py b/tests/tests_pypsrp/test_host.py
@@ -41,7 +41,7 @@ def gen_rsa_keypair(public_exponent, key_size, backend):
 
     public_numbers = rsa.RSAPublicNumbers(e, n)
     numbers = rsa.RSAPrivateNumbers(p, q, d, dmp1, dmq1, iqmp, public_numbers)
-    key = default_backend().load_rsa_private_numbers(numbers)
+    key = numbers.private_key()
 
     return key
 

diff --git a/tests/tests_pypsrp/test_powershell.py b/tests/tests_pypsrp/test_powershell.py
@@ -65,7 +65,7 @@ def gen_rsa_keypair(public_exponent, key_size, backend):
 
     public_numbers = rsa.RSAPublicNumbers(e, n)
     numbers = rsa.RSAPrivateNumbers(p, q, d, dmp1, dmq1, iqmp, public_numbers)
-    key = default_backend().load_rsa_private_numbers(numbers)
+    key = numbers.private_key()
 
     return key