From 52a4fe12b77475cf0d654835ab2bcaa7a4ecbdad Mon Sep 17 00:00:00 2001
From: Aleksei Rubashev <a_rubashev@wargaming.net>
Date: Tue, 23 Jul 2024 19:58:26 +0300
Subject: [PATCH] ! package workflows remade

---
 .github/workflows/python-dev-package.yml | 58 +++-------------------
 .github/workflows/python-package.yml     | 62 ++----------------------
 2 files changed, 12 insertions(+), 108 deletions(-)

diff --git a/.github/workflows/python-dev-package.yml b/.github/workflows/python-dev-package.yml
index 944f6b0..423892f 100644
--- a/.github/workflows/python-dev-package.yml
+++ b/.github/workflows/python-dev-package.yml
@@ -1,67 +1,23 @@
-# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
 name: DEV Package and TestPyPi Upload
 
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - master
-      - develop
-  pull_request:
-    branches:
-      - master
-      - develop
 
 concurrency:
   group: ${{ github.ref }}-${{ github.workflow }}
   cancel-in-progress: true
 
+
 jobs:
   build:
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        # python-version: ['2.7', '3.6', '3.7', '3.9', '3.10', '3.11', '3.12']
-        python-version: [ '3.7', '3.9', '3.10', '3.11', '3.12' ]
-
-    env:
-      PYTHONWARNINGS: 'ignore:DEPRECATION::pip._internal.cli.base_command'
-
     steps:
       - uses: actions/checkout@v4
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      - name: Build and publish to pypi
+        uses: JRubics/poetry-publish@v2.0
         with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Display Python version
-        run: python -c "import sys; print(sys.version)"
-
-      - name: Install dependencies
-        run: |
-          pip install -r requirements.txt -r requirements-tests.txt
-
-      - name: Test with tox
-        run: |
-          python -m pip install tox
-          tox -e py
-
-      - name: Test with flake8
-        if: matrix.python-version == '3.12'
-        run: |
-          python -m pip install tox
-          tox -e flake8
-
-      - name: Build and Publish to TestPyPi
-        if: matrix.python-version == '3.12'
-        env:
-          TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.PYPI_TEST_PASSWORD }}
-        run: |
-          python -m pip install twine
-          python setup.py sdist bdist_wheel
-          twine upload --repository testpypi dist/* --verbose --skip-existing
+          pypi_token: ${{ secrets.PYPI_TEST_TOKEN }}
+          python_version: ${{ env.PYTHON_BUILD_VERSION }}
+          repository_name: "testpypi"
+          repository_url: "https://test.pypi.org/legacy/"
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 62fc428..8996662 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -1,13 +1,7 @@
-# This workflow will upload a Python Package using Twine when a release is created
-# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
-
 name: Package and PyPi Upload
 
 on:
   workflow_dispatch:
-  push:
-    tags:
-      - v*
 
 concurrency:
   group: ${{ github.ref }}-${{ github.workflow }}
@@ -18,56 +12,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        # python-version: ['2.7', '3.6', '3.7', '3.9', '3.10', '3.11', '3.12']
-        python-version: [ '3.7', '3.9', '3.10', '3.11', '3.12' ]
-
-    env:
-      PYTHONWARNINGS: 'ignore:DEPRECATION::pip._internal.cli.base_command'
-
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - name: Build and publish to pypi
+        uses: JRubics/poetry-publish@v2.0
         with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Display Python version
-        run: python -c "import sys; print(sys.version)"
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-          if [ -f requirements-tests.txt ]; then pip install -r requirements-tests.txt; fi
-
-      #            -   name: Lint with flake8
-      #                run: |
-      #                    python -m pip install flake8
-      #                    # stop the build if there are Python syntax errors or undefined names
-      #                    flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-      #                    # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-      #                    flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-
-      - name: Test with tox
-        run: |
-          python -m pip install tox
-          tox -e py
-
-      - name: Test with flake8
-        if: matrix.python-version == '3.12'
-        run: |
-          python -m pip install tox
-          tox -e flake8
-
-      - name: Build and Publish to TestPyPi
-        if: matrix.python-version == '3.12'
-        env:
-          TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-        run: |
-          python -m pip install twine
-          python setup.py sdist bdist_wheel
-          twine upload dist/* --verbose --skip-existing
+          pypi_token: ${{ secrets.PYPI_TOKEN }}
+          python_version: ${{ env.PYTHON_BUILD_VERSION }}