From 87428d6293cd69d10528ea6f89c2a8d9d4d09931 Mon Sep 17 00:00:00 2001
From: Vitor Hideyoshi Nakazone Batista <vitor.h.n.batista@gmail.com>
Date: Mon, 24 Jun 2024 00:59:34 -0300
Subject: [PATCH] Fixes Dynamic Version Pattern

---
 .github/workflows/python-pypi-test-upload.yml |  2 +-
 .github/workflows/python-pypi-upload.yml      | 34 +++++++------------
 .gitignore                                    |  1 +
 pyproject.toml                                |  5 ++-
 4 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/python-pypi-test-upload.yml b/.github/workflows/python-pypi-test-upload.yml
index bf7b3cb..47f0f87 100644
--- a/.github/workflows/python-pypi-test-upload.yml
+++ b/.github/workflows/python-pypi-test-upload.yml
@@ -18,7 +18,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.8
+    - name: Set up Python 3.10
       uses: actions/setup-python@v3
       with:
         python-version: "3.10"
diff --git a/.github/workflows/python-pypi-upload.yml b/.github/workflows/python-pypi-upload.yml
index fdacd7c..0b1ffc4 100644
--- a/.github/workflows/python-pypi-upload.yml
+++ b/.github/workflows/python-pypi-upload.yml
@@ -18,32 +18,22 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.8
+    - name: Set up Python 3.10
       uses: actions/setup-python@v3
       with:
-        python-version: "3.8"
+        python-version: "3.10"
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip pipenv
-        if [ -f Pipfile ]; then pipenv install; fi
+        python -m pip install --upgrade pip poetry
+        if [ -f pyproject.toml ]; then poetry install; fi
     - name: Build Cython Code
       run: |
-        pipenv run make
-    - name: Test with unittest
+        poetry build -f sdist
+#    - name: Test with unittest
+#      run: |
+#        poetry run python -m unittest
+    - name: Build and Upload Python Package
       run: |
-        pipenv run python -m unittest
-    - name: Build Pip Packge
-      run: |
-        pipenv run VERSION_SUFIX=${GITHUB_RUN_ID} python setup.py sdist bdist_wheel
-    - name: Convert Pip Packge To ManyLinux
-      run: |
-        wget https://github.com/NixOS/patchelf/releases/download/0.17.0/patchelf-0.17.0.tar.gz
-        tar xf patchelf-0.17.0.tar.gz
-        cd patchelf-0.17.0
-        ./configure
-        sudo make install
-        cd ..
-        pipenv run python -m auditwheel repair --plat manylinux_2_17_x86_64 dist/yoshi_seals-*.whl
-    - name: Upload Pip Packge
-      run: |
-        pipenv run TWINE_USERNAME=${{secrets.PYPI_USER}} TWINE_PASSWORD=${{secrets.PYPI_TOKEN}} python -m twine upload --repository-url https://upload.pypi.org/legacy/ wheelhouse/*
+        poetry config repositories.pypi https://pypi.org/legacy/
+        poetry config pypi-token.pypi ${{secrets.PYPI_TOKEN}}
+        poetry publish --repository pypi
diff --git a/.gitignore b/.gitignore
index e33264e..f9de5e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ __pycache__/
 *.py[cod]
 
 # C extensions
+*.c
 *.so
 
 # Environment variables
diff --git a/pyproject.toml b/pyproject.toml
index 32ce432..52a2045 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -28,10 +28,9 @@ setuptools = "^70.1.0"
 [tool.poetry-dynamic-versioning]
 enable = true
 vcs = "git"
-base = "2.1"
-format = "v{base}+{distance}.{commit}"
+format = "v2.2+{distance}.{commit}"
 
 
 [build-system]
-requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"]
+requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0", "setuptools>=70.1.0", "cython>=3.0.10", "numpy>=2.0.0"]
 build-backend = "poetry_dynamic_versioning.backend"