Migrate to pyproject

.github/workflows/publish.yml

@@ -1,140 +1,78 @@
 name: Build and publish
+
 on:
   pull_request:
     types: [closed]
     branches:
-      - master
       - develop
       - beta
       - stable
       - 'v*.*.*'
-      - 'fair'
-      - 'fair-*'
 
 jobs:
-  create_release:
+  build_and_release:
     if: github.event.pull_request.merged
-    name: Create release
+    name: Build and create release
     runs-on: ubuntu-22.04
-    outputs:
-      upload_url: ${{ steps.create_release.outputs.upload_url }}
-      version: ${{ steps.export_outputs.outputs.version }}
-      branch: ${{ steps.export_outputs.outputs.branch }}
+    permissions:
+      contents: write
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           submodules: true
 
-      - name: Checkout submodules
-        run: git submodule update --init --recursive
-
-      - name: Install ubuntu dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install python-setuptools
-
-      - name: Set Versions
-        run: |
-          bash ./scripts/set_versions_ga.sh
-
-      - name: Set release
-        run: |
-          if [[ "$BRANCH" == "stable" ]]; then
-            export PRERELEASE=false
-          else
-            export PRERELEASE=true
-          fi
-          echo "PRERELEASE=$PRERELEASE" >> $GITHUB_ENV
-
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ env.VERSION }}
-          release_name: ${{ env.VERSION }}
-          draft: false
-          prerelease: ${{ env.PRERELEASE }}
-
-      - name: Export outputs
-        id: export_outputs
-        run: |
-          echo "::set-output name=version::$VERSION"
-          echo "::set-output name=branch::$BRANCH"
-
-  build_and_publish:
-    if: github.event.pull_request.merged
-    needs: create_release
-    name: Build and publish ${{ matrix.build_type }} for ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-22.04] 
-        build_type: [skale, fair] 
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4 
+      - name: Set up Python 3.13
+        uses: actions/setup-python@v5
         with:
-          submodules: true 
+          python-version: 3.13
 
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v5 
-        with:
-          python-version: 3.11
-
-      - name: Install ubuntu dependencies
-        if: matrix.os == 'ubuntu-22.04'
+      - name: Calculate version
+        id: versioning
         run: |
-          sudo apt-get update
-
-      - name: Ensure submodules are updated
-        run: git submodule update --init --recursive
-
-      - name: Define Asset Name
-        id: asset_details
+          bash ./scripts/set_versions_ga.sh
+
+      - name: Determine prerelease status
+        id: release_info
         run: |
-          ASSET_BASE_NAME="skale-${{ needs.create_release.outputs.version }}-Linux-x86_64"
-          if [[ "${{ matrix.build_type }}" == "skale" ]]; then
-            echo "FINAL_ASSET_NAME=${ASSET_BASE_NAME}" >> $GITHUB_OUTPUT
+          if [[ "${{ env.BRANCH }}" == "stable" ]]; then
+            echo "prerelease=false" >> $GITHUB_OUTPUT
           else
-            echo "FINAL_ASSET_NAME=${ASSET_BASE_NAME}-${{ matrix.build_type }}" >> $GITHUB_OUTPUT
+            echo "prerelease=true" >> $GITHUB_OUTPUT
           fi
 
-      - name: Build ${{ matrix.build_type }} release binary
+      - name: Build binaries
+        id: build
         run: |
           mkdir -p ${{ github.workspace }}/dist
           docker build . -t node-cli-builder
+
           docker run --rm -v ${{ github.workspace }}/dist:/app/dist node-cli-builder \
-            bash scripts/build.sh ${{ needs.create_release.outputs.version }} ${{ needs.create_release.outputs.branch }} ${{ matrix.build_type }}
-          echo "Contents of dist directory:"
-          ls -altr ${{ github.workspace }}/dist/
-          docker rm -f $(docker ps -aq) || true
-
-      - name: Save sha512sum for ${{ steps.asset_details.outputs.FINAL_ASSET_NAME }}
+            bash scripts/build.sh ${{ env.VERSION }} ${{ env.BRANCH }} skale
+
+          docker run --rm -v ${{ github.workspace }}/dist:/app/dist node-cli-builder \
+            bash scripts/build.sh ${{ env.VERSION }} ${{ env.BRANCH }} fair
+
+          echo "dist_path=${{ github.workspace }}/dist" >> $GITHUB_OUTPUT
+
+      - name: Generate checksums
         run: |
-          cd ${{ github.workspace }}/dist
-          sha512sum ${{ steps.asset_details.outputs.FINAL_ASSET_NAME }} > ${{ steps.asset_details.outputs.FINAL_ASSET_NAME }}.sha512sum
-          echo "Checksum file created: ${{ steps.asset_details.outputs.FINAL_ASSET_NAME }}.sha512sum"
-          cat ${{ steps.asset_details.outputs.FINAL_ASSET_NAME }}.sha512sum
-
-      - name: Upload release binary (${{ matrix.build_type }})
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          cd ${{ steps.build.outputs.dist_path }}
+          for file in skale-*; do
+            sha512sum "$file" > "$file.sha512"
+          done
+          echo "Checksums generated:"
+          ls -l *.sha512
+
+      - name: Create GitHub release
+        uses: softprops/action-gh-release@v2
         with:
-          upload_url: ${{ needs.create_release.outputs.upload_url }}
-          asset_path: ${{ github.workspace }}/dist/${{ steps.asset_details.outputs.FINAL_ASSET_NAME }}
-          asset_name: ${{ steps.asset_details.outputs.FINAL_ASSET_NAME }}
-          asset_content_type: application/octet-stream
-
-      - name: Upload release checksum (${{ matrix.build_type }})
-        uses: actions/upload-release-asset@v1
+          tag_name: ${{ env.VERSION }}
+          name: Release ${{ env.VERSION }}
+          draft: false
+          prerelease: ${{ steps.release_info.outputs.prerelease }}
+          generate_release_notes: true
+          files: |
+            ${{ steps.build.outputs.dist_path }}/skale-*
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create_release.outputs.upload_url }}
-          asset_path: ${{ github.workspace }}/dist/${{ steps.asset_details.outputs.FINAL_ASSET_NAME }}.sha512sum
-          asset_name: ${{ steps.asset_details.outputs.FINAL_ASSET_NAME }}.sha512
-          asset_content_type: text/plain

.github/workflows/test.yml

@@ -6,41 +6,52 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: [3.11]
+        python-version: ['3.13']
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: true
 
     - name: Checkout submodules
       run: git submodule update --init
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
+    - name: Install uv
+      run: curl -LsSf https://astral.sh/uv/install.sh | sh
+
+    - name: Cache uv
+      uses: actions/cache@v4
+      with:
+        path: ~/.cache/uv
+        key: ${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('pyproject.toml') }}
+
     - name: Install ubuntu dependencies
       run: |
         sudo apt-get update
         sudo apt-get install iptables nftables python3-nftables
 
     - name: Install python dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install -e ".[dev]"
+        uv venv
+        uv pip install -e ".[dev]"
 
     - name: Generate info
       run: bash ./scripts/generate_info.sh 1.0.0 my-branch skale
 
     - name: Check with ruff
       run: |
-        ruff check
+        uv run ruff check
+
+    - name: Build docker image
+      run: docker build . -t node-cli-builder
 
     - name: Build binary - skale
       run: |
         mkdir -p ./dist
-        docker build . -t node-cli-builder
         docker run  -v /home/ubuntu/dist:/app/dist node-cli-builder bash scripts/build.sh test test skale
         docker rm -f $(docker ps -aq)
 
@@ -50,7 +61,6 @@ jobs:
     - name: Build binary - fair
       run: |
         mkdir -p ./dist
-        docker build . -t node-cli-builder
         docker run  -v /home/ubuntu/dist:/app/dist node-cli-builder bash scripts/build.sh test test fair
         docker rm -f $(docker ps -aq)
 
@@ -59,7 +69,7 @@ jobs:
 
     - name: Run prepare test build
       run: |
-        bash scripts/build.sh test test skale
+        uv run bash scripts/build.sh test test skale
 
     - name: Run redis
       run: |
@@ -68,8 +78,8 @@ jobs:
     - name: Run tests
       run: |
         export PYTHONPATH=${PYTHONPATH}:/usr/lib/python3/dist-packages/
-        bash ./scripts/run_tests.sh
+        uv run bash ./scripts/run_tests.sh
 
     - name: Run nftables tests
       run: |
-        scripts/run_nftables_test.sh
+        uv run scripts/run_nftables_test.sh

Dockerfile

@@ -1,29 +1,32 @@
-FROM python:3.11-bookworm
+FROM python:3.13-slim-bookworm AS builder
 
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt install -y \
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv
+
+WORKDIR /app
+
+COPY pyproject.toml ./
+
+RUN uv pip install --system --no-cache ".[dev]"
+
+FROM python:3.13-slim-bookworm
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
     git \
-    build-essential \
-    software-properties-common \
-    zlib1g-dev \
-    libssl-dev \
-    libffi-dev \
-    swig \
     iptables \
-    nftables \ 
-    python3-nftables \ 
-    libxslt-dev \
-    kmod
-
+    nftables \
+    python3-nftables \
+    kmod \
+    wget \
+    binutils && \
+    rm -rf /var/lib/apt/lists/*
 
-RUN mkdir /app
 WORKDIR /app
 
-COPY . .
+COPY --from=builder /usr/local/lib/python3.13/site-packages /usr/local/lib/python3.13/site-packages
+COPY --from=builder /usr/local/bin /usr/local/bin
 
-ENV PATH=/app/buildvenv/bin:$PATH
-ENV PYTHONPATH="{PYTHONPATH}:/usr/lib/python3/dist-packages"
+COPY . .
 
-RUN pip install --upgrade pip && \
-    pip install wheel setuptools==63.2.0 && \
-    pip install -e '.[dev]' 
+ENV PYTHONPATH="/app:/usr/lib/python3/dist-packages"
+ENV COLUMNS=80

main.spec

@@ -1,16 +1,15 @@
 # -*- mode: python -*-
 
-import importlib.util
-
+import os
 
 block_cipher = None
 
 a = Analysis(
     ['node_cli/main.py'],
-    pathex=['.'],
+    pathex=[SPECPATH],
     datas=[
-       ("./text.yml", "data"),
-       ("./datafiles/skaled-ssl-test", "data/datafiles")
+       (os.path.join(SPECPATH, "text.yml"), "data"),
+       (os.path.join(SPECPATH, "datafiles/skaled-ssl-test"), "data/datafiles")
     ],
     hiddenimports=[],
     hookspath=[],

node_cli/cli/__init__.py

@@ -1,4 +1,6 @@
-__version__ = '3.2.0'
+from importlib.metadata import version
+
+__version__ = version("node-cli")
 
 if __name__ == '__main__':
     print(__version__)