Fix workflow and test

Author: cffls

.github/workflows/main.yml

@@ -28,9 +28,6 @@ jobs:
       - name: Install dependencies
         run: |
           poetry install
-      - name: Ensure pure cbor2 is installed
-        run: |
-          make ensure-pure-cbor2
       - name: Run unit tests
         run: |
           poetry run pytest --doctest-modules --ignore=examples --cov=pycardano --cov-config=.coveragerc --cov-report=xml

.github/workflows/publish.yml

@@ -24,9 +24,6 @@ jobs:
       - name: Install dependencies
         run: |
           poetry install
-      - name: Ensure pure cbor2 is installed
-        run: |
-          make ensure-pure-cbor2
       - name: Lint with flake8
         run: |
           poetry run flake8 pycardano

integration-test/run_tests.sh

@@ -6,7 +6,6 @@ set -o pipefail
 ROOT=$(pwd)
 
 poetry install -C ..
-make ensure-pure-cbor2 -f ../Makefile
 #poetry run pip install ogmios
 
 ##########

pycardano/__init__.py

@@ -5,7 +5,7 @@
 if os.getenv("CBOR_C_EXETENSION", "0") == "1":
     import cbor2
 else:
-    import cbor2pure as cbor2
+    import cbor2pure as cbor2  # type: ignore[no-redef]
 
 from .address import *
 from .backend import *

pycardano/address.py

@@ -14,10 +14,10 @@
 from typing import Optional, Type, Union
 
 import base58
-from pycardano import cbor2
 from cbor2 import CBORTag
 from typing_extensions import override
 
+from pycardano import cbor2
 from pycardano.crypto.bech32 import decode, encode
 from pycardano.exception import (
     DecodingException,

pycardano/backend/blockfrost.py

@@ -5,10 +5,10 @@
 from fractions import Fraction
 from typing import Dict, List, Optional, Union
 
-from pycardano import cbor2
 from blockfrost import ApiError, ApiUrls, BlockFrostApi
 from blockfrost.utils import Namespace
 
+from pycardano import cbor2
 from pycardano.address import Address
 from pycardano.backend.base import (
     ALONZO_COINS_PER_UTXO_WORD,

pycardano/backend/cardano_cli.py

@@ -12,11 +12,11 @@
 from pathlib import Path
 from typing import Dict, List, Optional, Union
 
-from pycardano import cbor2
 import docker
 from cachetools import Cache, LRUCache, TTLCache, func
 from docker.errors import APIError
 
+from pycardano import cbor2
 from pycardano.address import Address
 from pycardano.backend.base import (
     ALONZO_COINS_PER_UTXO_WORD,

pycardano/plutus.py

@@ -10,12 +10,12 @@
 from hashlib import sha256
 from typing import Any, List, Optional, Type, Union
 
-from pycardano import cbor2
 from cbor2 import CBORTag
 from nacl.encoding import RawEncoder
 from nacl.hash import blake2b
 from typeguard import typechecked
 
+from pycardano import cbor2
 from pycardano.exception import DeserializeException, InvalidArgumentException
 from pycardano.hash import DATUM_HASH_SIZE, SCRIPT_HASH_SIZE, DatumHash, ScriptHash
 from pycardano.nativescript import NativeScript

pycardano/serialization.py

@@ -32,7 +32,6 @@
 )
 
 from pycardano import cbor2
-
 from pycardano.logging import logger
 
 # Remove the semantic decoder for 258 (CBOR tag for set) as we care about the order of elements

pycardano/transaction.py

@@ -6,12 +6,12 @@
 from dataclasses import dataclass, field
 from typing import Any, Callable, List, Optional, Type, Union
 
-from pycardano import cbor2
 from cbor2 import CBORTag
 from nacl.encoding import RawEncoder
 from nacl.hash import blake2b
 from pprintpp import pformat
 
+from pycardano import cbor2
 from pycardano.address import Address
 from pycardano.certificate import Certificate
 from pycardano.exception import InvalidDataException
@@ -105,7 +105,7 @@ def __add__(self, other: Asset) -> Asset:
 
     def __iadd__(self, other: Asset) -> Asset:
         new_item = self + other
-        self.data = new_item.data
+        self.data = new_item.data  # type: ignore[has-type]
         return self.normalize()
 
     def __sub__(self, other: Asset) -> Asset: