Merge pull request #603 from boriel/build/dependencies

build: update project dependencies

Author: boriel

.pre-commit-config.yaml

@@ -6,6 +6,6 @@ repos:
         -   id: end-of-file-fixer
         -   id: trailing-whitespace
   -   repo: https://github.com/psf/black
-      rev: 21.9b0
+      rev: 22.1.0
       hooks:
         -   id: black

poetry.lock

@@ -46,11 +46,11 @@ python = "^3.8"
 [tool.poetry.dev-dependencies]
 tox = "^3.15.1"
 flake8 = "^3.8.2"
-pytest = "^5.4.2"
+pytest = "^6.2.5"
 pytest-timeout = "^1.3.4"
 bump2version = "^1.0.0"
 pre-commit = "^2.15.0"
-black = "^21.9b0"
+black = "^22.1.0"
 mkdocs = "^1.2.2"
 
 [build-system]

pyproject.toml

@@ -35,7 +35,7 @@ def f16(op):
         op = -op
 
     DE = int(op)
-    HL = int((op - DE) * 2 ** 16) & 0xFFFF
+    HL = int((op - DE) * 2**16) & 0xFFFF
     DE &= 0xFFFF
 
     if negative:  # Do C2

src/arch/z80/backend/_f16.py

@@ -54,7 +54,7 @@ def getDEHL(duration, pitch):
 
     frec = TABLE[A]
     tmp2 = tmp * frec
-    f = tmp2 * 2.0 ** B
+    f = tmp2 * 2.0**B
 
     DE = int(0.5 + f * duration - 1)
     HL = int(0.5 + 437500.0 / f - 30.125)

src/arch/z80/beep.py

@@ -1038,7 +1038,7 @@ def default_value(cls, type_, expr):  # TODO: This function must be moved to api
             return [C, DE[-2:], DE[:-2], HL[-2:], HL[:-2]]
 
         if type_ == cls.TYPE(TYPE.fixed):
-            value = 0xFFFFFFFF & int(expr.value * 2 ** 16)
+            value = 0xFFFFFFFF & int(expr.value * 2**16)
         else:
             value = int(expr.value)
 

src/arch/z80/translator.py

@@ -142,7 +142,7 @@ def emit_data_blocks(self):
                     lbl = self.add_string_label(d.value.value)
                     self.ic_data(gl.PTR_TYPE, [lbl])
                 elif d.value.type_ == self.TYPE(TYPE.fixed):  # Convert to bytes
-                    bytes_ = 0xFFFFFFFF & int(d.value.value * 2 ** 16)
+                    bytes_ = 0xFFFFFFFF & int(d.value.value * 2**16)
                     self.ic_data(TYPE.uinteger, ["0x%04X" % (bytes_ & 0xFFFF), "0x%04X" % (bytes_ >> 16)])
                 else:
                     self.ic_data(d.value.type_, [self.traverse_const(d.value)])

src/arch/z80/translatorvisitor.py

@@ -54,7 +54,7 @@ def getDEHL(duration, pitch):
 
     frec = TABLE[A]
     tmp2 = tmp * frec
-    f = tmp2 * 2.0 ** B
+    f = tmp2 * 2.0**B
 
     DE = int(0.5 + f * duration - 1)
     HL = int(0.5 + 437500.0 / f - 30.125)

src/arch/zx48k/beep.py

@@ -96,25 +96,21 @@ def make_node(cls, operator, left, right, lineno, func=None, type_=None):
                 b = SymbolTYPECAST.make_node(c_type, b, lineno)  # ensure type
                 return SymbolCONST(cls(operator, a, b, lineno, type_=type_, func=func), lineno=lineno)
 
-        if (
-            operator
-            in {
-                "BNOT",
-                "BAND",
-                "BOR",
-                "BXOR",
-                "NOT",
-                "AND",
-                "OR",
-                "XOR",
-                "MINUS",
-                "MULT",
-                "DIV",
-                "SHL",
-                "SHR",
-            }
-            and not check.is_numeric(a, b)
-        ):
+        if operator in {
+            "BNOT",
+            "BAND",
+            "BOR",
+            "BXOR",
+            "NOT",
+            "AND",
+            "OR",
+            "XOR",
+            "MINUS",
+            "MULT",
+            "DIV",
+            "SHL",
+            "SHR",
+        } and not check.is_numeric(a, b):
             errmsg.error(lineno, "Operator %s cannot be used with STRINGS" % operator)
             return None
 

src/symbols/binary.py

@@ -15,7 +15,7 @@ class Expr(Ast):
         "+": lambda x, y: x + y,
         "*": lambda x, y: x * y,
         "/": lambda x, y: x // y,
-        "^": lambda x, y: x ** y,
+        "^": lambda x, y: x**y,
         "%": lambda x, y: x % y,
         "&": lambda x, y: x & y,
         "|": lambda x, y: x | y,