From 4bfbcbc298d3e255521afe3310ddcae190f67ac4 Mon Sep 17 00:00:00 2001
From: Lorenz Herzberger <lorenzherzberger@gmail.com>
Date: Wed, 15 Feb 2023 14:21:44 +0100
Subject: [PATCH] updated CI and Makefile

Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>
---
 .github/workflows/CI.yml | 24 +++++++++++++-----------
 Makefile                 |  4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index cc5e229..7f00930 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -44,14 +44,17 @@ jobs:
       - name: Install pip-audit
         run: pip install --upgrade pip pip-audit 
 
+      - name: Setup poetry
+        uses: Gr1N/setup-poetry@v7
+
       - name: Install dependencies
-        run: pip install .
+        run: poetry install
 
       - name: Create requirements.txt
-        run: pip freeze > requirements.txt
+        run: poetry run pip freeze > requirements.txt
 
       - name: Audit dependencies
-        run: pip-audit --ignore-vuln PYSEC-2022-42969 --ignore-vuln PYSEC-2022-203 --ignore-vuln GHSA-r9hx-vwmv-q579
+        run: poetry run pip-audit --ignore-vuln PYSEC-2022-42969 --ignore-vuln PYSEC-2022-203 --ignore-vuln GHSA-r9hx-vwmv-q579
 
   test:
     needs: lint
@@ -81,9 +84,11 @@ jobs:
       - name: Get Tendermint
         run: wget https://github.com/tendermint/tendermint/releases/download/v0.34.15/tendermint_0.34.15_linux_amd64.tar.gz && tar zxf tendermint_0.34.15_linux_amd64.tar.gz
 
-      - name: Install Planetmint
-        run: pip install -e '.[dev]'
+      - name: Setup poetry
+        uses: Gr1N/setup-poetry@v7
 
+      - name: Install Planetmint
+        run: poetry install --with dev
 
       - name: Execute Tests
         run: make test
@@ -106,15 +111,12 @@ jobs:
         uses: Gr1N/setup-poetry@v7
 
       - name: Install dependencies
-        run: pip install -e '.[dev]' && pip install wheel && python setup.py bdist_wheel sdist
+        run: poetry install --with dev
 
       - name: Upload to PyPI
         run: |
-          twine check dist/*
-          twine upload --skip-existing dist/*
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+          poetry build
+          poetry publish -u __token__ -p ${{ secrets.PYPI_TOKEN }}
 
       - name: Upload to GitHub
         uses: softprops/action-gh-release@v1
diff --git a/Makefile b/Makefile
index 853fb2d..24aa4b8 100644
--- a/Makefile
+++ b/Makefile
@@ -83,9 +83,9 @@ test-unit: check-deps ## Run all tests once or specify a file/test with TEST=tes
 	@$(DC) up -d tarantool
 	#wget https://github.com/tendermint/tendermint/releases/download/v0.34.15/tendermint_0.34.15_linux_amd64.tar.gz
 	#tar zxf tendermint_0.34.15_linux_amd64.tar.gz
-	pytest -m "not abci"
+	poetry run pytest -m "not abci"
 	rm -rf ~/.tendermint && ./tendermint init && ./tendermint node --consensus.create_empty_blocks=false --rpc.laddr=tcp://0.0.0.0:26657 --proxy_app=tcp://localhost:26658&
-	pytest -m abci
+	poetry run pytest -m abci
 	@$(DC) down