Merge remote-tracking branch 'pycardano/main' into feat/cip67-cip68

Author: Cat-Treat

.github/workflows/main.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
       - uses: actions/checkout@v4
@@ -28,15 +28,18 @@ 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
       - name: "Upload coverage to Codecov"
         if: ${{ matrix.python-version == '3.11' }}
         uses: codecov/codecov-action@v4
         with:
-          fail_ci_if_error: true
-          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: false
+          token: ${{ secrets.CODECOV_TOKEN || '' }}
       - name: Run static analyses
         if: ${{ matrix.python-version == '3.11' }}
         run: |
@@ -72,8 +75,8 @@ jobs:
         if: ${{ matrix.python-version == '3.11' }}
         uses: codecov/codecov-action@v4
         with:
-          fail_ci_if_error: true
-          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: false
+          token: ${{ secrets.CODECOV_TOKEN || '' }}
 
       - name: Dump docker logs
         if: failure()

.github/workflows/publish.yml

@@ -24,6 +24,9 @@ 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

.gitignore

@@ -5,9 +5,11 @@ docs/build
 dist
 .mypy_cache
 coverage.xml
+.cbor2_version
 
 # IDE
 .idea
 .code
 /integration-test/.env
 /integration-test/tmp_configs/*
+/integration-test/.coverage*

Makefile

@@ -23,10 +23,25 @@ export PRINT_HELP_PYSCRIPT
 
 BROWSER := poetry run python -c "$$BROWSER_PYSCRIPT"
 
+ensure-pure-cbor2: ## ensures cbor2 is installed with pure Python implementation
+	@poetry run python -c "from importlib.metadata import version; \
+	print(version('cbor2'))" > .cbor2_version
+	@poetry run python -c "import cbor2, inspect; \
+	print('Checking cbor2 implementation...'); \
+	decoder_path = inspect.getfile(cbor2.CBORDecoder); \
+	using_c_ext = decoder_path.endswith('.so'); \
+	print(f'Implementation path: {decoder_path}'); \
+	print(f'Using C extension: {using_c_ext}'); \
+	exit(1 if using_c_ext else 0)" || \
+	(echo "Reinstalling cbor2 with pure Python implementation..." && \
+	poetry run pip uninstall -y cbor2 && \
+	CBOR2_BUILD_C_EXTENSION=0 poetry run pip install --no-binary cbor2 "cbor2==$$(cat .cbor2_version)" --force-reinstall && \
+	rm .cbor2_version)
+
 help:
 	@python -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST)
 
-cov: ## check code coverage
+cov: ensure-pure-cbor2 ## check code coverage
 	poetry run pytest -n 4 --cov pycardano
 
 cov-html: cov ## check code coverage and generate an html report
@@ -54,13 +69,16 @@ clean-test: ## remove test and coverage artifacts
 	rm -fr cov_html/
 	rm -fr .pytest_cache
 
-test: ## runs tests
+test: ensure-pure-cbor2 ## runs tests
 	poetry run pytest -vv -n 4
 
+test-integration: ## runs integration tests
+	cd integration-test && ./run_tests.sh
+
 test-single: ## runs tests with "single" markers
 	poetry run pytest -s -vv -m single
 
-qa: ## runs static analyses
+qa: ensure-pure-cbor2 ## runs static analyses
 	poetry run flake8 pycardano
 	poetry run mypy --install-types --non-interactive pycardano
 	poetry run black --check .
@@ -75,6 +93,6 @@ docs: ## build the documentation
 	poetry run sphinx-build docs/source docs/build/html
 	$(BROWSER) docs/build/html/index.html
 
-release: clean qa test format ## build dist version and release to pypi
+release: clean qa test format ensure-pure-cbor2 ## build dist version and release to pypi
 	poetry build
 	poetry publish

README.md

@@ -254,6 +254,5 @@ You can support us by 1) sponsoring through Github, or 2) donating ADA to our AD
 ## Sponsors :heart:
 
 <p align="left">
-  <a href="https://github.com/KtorZ"><img src="https://avatars.githubusercontent.com/u/5680256?s=50&v=4"/></a>
   <a href="https://github.com/blockfrost"><img src="https://avatars.githubusercontent.com/u/70073210?s=50&v=4"/></a>
 </p>

docs/requirements.txt

@@ -1,52 +1,52 @@
 alabaster==0.7.13 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 annotated-types==0.7.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 asn1crypto==1.5.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-attrs==24.2.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-babel==2.16.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+attrs==25.1.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+babel==2.17.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 black==24.8.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 blinker==1.8.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 blockfrost-python==0.6.0 ; python_full_version >= "3.8.1" and python_version < "4"
-cachetools==5.5.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+cachetools==5.5.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 cardano-tools==2.1.0 ; python_full_version >= "3.8.1" and python_version < "4.0"
-cbor2==5.6.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-certifi==2024.8.30 ; python_full_version >= "3.8.1" and python_version < "4"
+cbor2==5.6.5 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+certifi==2025.1.31 ; python_full_version >= "3.8.1" and python_version < "4"
 certvalidator==0.11.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 cffi==1.17.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-charset-normalizer==3.3.2 ; python_full_version >= "3.8.1" and python_version < "4"
-click==8.1.7 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+charset-normalizer==3.4.1 ; python_full_version >= "3.8.1" and python_version < "4"
+click==8.1.8 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 colorama==0.4.6 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" and (sys_platform == "win32" or platform_system == "Windows")
 coloredlogs==15.0.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 cose==0.9.dev8 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 coverage[toml]==7.6.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-cryptography==43.0.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+cryptography==43.0.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 decorator==5.1.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 docker==7.1.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 docutils==0.19 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 ecdsa==0.19.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 ecpy==1.2.5 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 exceptiongroup==1.2.2 ; python_full_version >= "3.8.1" and python_version < "3.11"
 execnet==2.1.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-flake8==7.1.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+flake8==7.1.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 flask==2.3.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-frozendict==2.4.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-frozenlist==1.4.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+frozendict==2.4.6 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+frozenlist==1.5.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 humanfriendly==10.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 idna==3.10 ; python_full_version >= "3.8.1" and python_version < "4"
 imagesize==1.4.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 importlib-metadata==8.5.0 ; python_full_version >= "3.8.1" and python_version < "3.10"
 iniconfig==2.0.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 isort==5.13.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 itsdangerous==2.2.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-jinja2==3.1.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+jinja2==3.1.5 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 markupsafe==2.1.5 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 mccabe==0.7.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 mnemonic==0.21 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 mypy-extensions==1.0.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 mypy==1.11.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-ogmios==1.2.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-orjson==3.10.7 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+ogmios==1.3.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+orjson==3.10.15 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 oscrypto==1.3.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-packaging==24.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+packaging==24.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 pathspec==0.12.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 pexpect==4.9.0 ; python_full_version >= "3.8.1" and python_version < "4.0"
 platformdirs==4.3.6 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
@@ -56,21 +56,21 @@ ptyprocess==0.7.0 ; python_full_version >= "3.8.1" and python_version < "4.0"
 py==1.11.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 pycodestyle==2.12.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 pycparser==2.22 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-pydantic-core==2.23.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-pydantic==2.9.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+pydantic-core==2.27.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+pydantic==2.10.6 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 pyflakes==3.2.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-pygments==2.18.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+pygments==2.19.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 pynacl==1.5.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 pyreadline3==3.5.4 ; sys_platform == "win32" and python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 pytest-cov==5.0.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 pytest-xdist==3.6.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-pytest==8.3.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-pytz==2024.2 ; python_full_version >= "3.8.1" and python_version < "3.9"
-pywin32==306 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" and sys_platform == "win32"
+pytest==8.3.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+pytz==2025.1 ; python_full_version >= "3.8.1" and python_version < "3.9"
+pywin32==308 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" and sys_platform == "win32"
 requests==2.32.3 ; python_full_version >= "3.8.1" and python_version < "4"
 retry==0.9.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-setuptools==75.1.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-six==1.16.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+setuptools==75.3.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+six==1.17.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 snowballstemmer==2.2.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 sphinx-copybutton==0.5.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 sphinx-rtd-theme==2.0.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
@@ -82,11 +82,12 @@ sphinxcontrib-jquery==4.1 ; python_full_version >= "3.8.1" and python_full_versi
 sphinxcontrib-jsmath==1.0.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 sphinxcontrib-qthelp==1.0.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 sphinxcontrib-serializinghtml==1.1.5 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-tomli==2.0.1 ; python_full_version >= "3.8.1" and python_full_version <= "3.11.0a6"
-typeguard==4.3.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+standard-imghdr==3.13.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+tomli==2.2.1 ; python_full_version >= "3.8.1" and python_full_version <= "3.11.0a6"
+typeguard==4.4.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 typing-extensions==4.12.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 urllib3==2.2.3 ; python_full_version >= "3.8.1" and python_version < "4"
 websocket-client==1.8.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 websockets==13.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
-werkzeug==3.0.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
+werkzeug==3.0.6 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"
 zipp==3.20.2 ; python_full_version >= "3.8.1" and python_version < "3.10"

docs/source/api/pycardano.governance.rst

@@ -0,0 +1,7 @@
+Governance
+==============================
+
+.. automodule:: pycardano.governance
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/source/api/pycardano.poolparams.rst

@@ -0,0 +1,7 @@
+Pool parameters
+========================
+
+.. automodule:: pycardano.pool_params
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/source/index.rst

@@ -38,12 +38,14 @@ making it a light-weight library that is easy and fast to set up in all kinds of
    api/pycardano.crypto
    api/pycardano.coinselection
    api/pycardano.exception
+   api/pycardano.governance
    api/pycardano.hash
    api/pycardano.key
    api/pycardano.metadata
    api/pycardano.nativescript
    api/pycardano.network
    api/pycardano.plutus
+   api/pycardano.poolparams
    api/pycardano.serialization
    api/pycardano.transaction
    api/pycardano.utils

examples/more_examples/.env-example

@@ -0,0 +1,3 @@
+network="testnet"
+wallet_mnemonic="select calm scorpion mask furnace nerve fade slam bid suggest avoid remove half depend turn little midnight fossil submit cart sick glance inner slide"
+blockfrost_api_key="preprod...."