Merge pull request #2 from Cat-Treat/feat/cip67-cip68

Feat/cip67 cip68

Author: theeldermillenial

.github/workflows/main.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: "**"
   pull_request:
-    branches: ["main"]
+    branches: ["main", "chang"]
     types: [opened, reopened, edited, synchronize]
 
 jobs:
@@ -14,29 +14,34 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: [3.7, 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@v3
+      - uses: actions/checkout@v4
       - name: Install poetry
         run: pipx install poetry
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'poetry'
       - 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@v3
+        uses: codecov/codecov-action@v4
         with:
-          fail_ci_if_error: true
+          fail_ci_if_error: false
+          token: ${{ secrets.CODECOV_TOKEN || '' }}
       - name: Run static analyses
+        if: ${{ matrix.python-version == '3.11' }}
         run: |
           make qa
 
@@ -48,27 +53,39 @@ jobs:
         python-version: ['3.11']
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install poetry
         run: pipx install poetry
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'poetry'
 
+      - name: Setup docker-compose
+        uses: KengoTODA/[email protected]
+        with:
+          version: '2.14.2'
+
       - name: Run integration tests
         run: |
           cd integration-test && ./run_tests.sh
 
+      - name: "Upload coverage to Codecov"
+        if: ${{ matrix.python-version == '3.11' }}
+        uses: codecov/codecov-action@v4
+        with:
+          fail_ci_if_error: false
+          token: ${{ secrets.CODECOV_TOKEN || '' }}
+
       - name: Dump docker logs
         if: failure()
         run: |
-          cd integration-test && docker-compose logs --no-color > integration-test.log
+          cd integration-test && docker compose logs --no-color > integration-test.log
 
       - name: Upload integration-test.log
         if: failure()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: integration-test.log
           path: integration-test/integration-test.log

.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

@@ -3,7 +3,13 @@
 cov_html
 docs/build
 dist
+.mypy_cache
+coverage.xml
+.cbor2_version
 
 # IDE
 .idea
-.code
+.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
-	poetry run pytest -s -vv -n 4
+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

@@ -66,7 +66,7 @@ https://pycardano.readthedocs.io/en/latest/
 
 A full stack testnet DApp is hosted on replit: https://pycardano.cffls.repl.co/
 
-To learn more details, go to the [DApp page](https://github.com/cffls/pycardano/tree/main/examples/full_stack).
+To learn more details, go to the [DApp page](https://github.com/Python-Cardano/pycardano/tree/main/examples/full_stack).
 
 #### Transaction creation and signing
 
@@ -254,10 +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/CardanoDur"><img width="50" src="https://avatars.githubusercontent.com/u/1000466?s=50&v=4"/></a>
-  <a href="https://github.com/huths0lo"><img width="50" src="https://avatars.githubusercontent.com/u/78839856?s=50&v=4"/></a>
-  <a href="https://github.com/markrufino"><img width="50" src="https://avatars.githubusercontent.com/u/30117352?v=4"/></a>
-  <a href="https://github.com/OpShin"><img width="50" src="https://avatars.githubusercontent.com/u/102762047?s=200&v=4"/></a>
-  <a href="https://github.com/aada-finance"><img width="50" src="https://avatars.githubusercontent.com/u/89693711?v=4"/></a>
+  <a href="https://github.com/blockfrost"><img src="https://avatars.githubusercontent.com/u/70073210?s=50&v=4"/></a>
 </p>