DRAFT: Update build tools

Let's use pyproject.toml

TICO-DCO-1.0-Signed-off-by: Dayoung Lee <dayoung.lee@samsung.com>

Author: dayo09

.github/workflows/check-pr.yaml

@@ -103,7 +103,7 @@ jobs:
 
       - name: "Build package"
         run: |
-          pip install setuptools
+          pip install build
           ./ccex build
 
       - name: "Run install"

.github/workflows/publish-nightly-package.yaml

@@ -15,12 +15,11 @@ jobs:
         ubuntu_version: [22.04]
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # Import all commit history and tag
 
       - name: "Build package"
         run: |
-          NIGHTLY_VERSION=$(date '+%y%m%d')
-          export NIGHTLY_VERSION
-          echo "NIGHTLY_VERSION=$NIGHTLY_VERSION" >> "$GITHUB_ENV"
           ./ccex build
 
       - name: "Upload artifact"

.github/workflows/publish-official-package.yaml

@@ -13,37 +13,42 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - name: Checkout the specified ref
+      - name: "Checkout the specified ref"
         uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref_name }}
+          fetch-depth: 0 # Import all commit history and tag
 
-      # Verify version consistency between tag and version.py
-      - name: Check version.py matches ref_name
+      - name: "Build package"
+        run: |
+          ./ccex build
+
+      - name: "Check requested version (ref_name)"
         run: |
-          FILE_VERSION=$(python -c 'exec(open("version.py").read()); print(VERSION)')
           INPUT_REF="${{ inputs.ref_name }}"
           TAG_VERSION="${INPUT_REF#v}"  # Strip leading 'v' from ref_name
 
-          echo "VERSION in version.py: $FILE_VERSION"
+          VERSION="$(versioningit)"
+          CLEAN_VERSION="$(echo "$VERSION" | cut -d'.' -f1-3)"
+
+          echo "$CLEAN_VERSION"
+
+          echo "VERSION from prepared package: $CLEAN_VERSION"
           echo "VERSION from ref_name: $TAG_VERSION"
 
-          if [ "$FILE_VERSION" != "$TAG_VERSION" ]; then
-            echo "::error::VERSION in version.py ($FILE_VERSION) does not match ref_name ($INPUT_REF)"
+          if [ "$CLEAN_VERSION" != "$TAG_VERSION" ]; then
+            echo "::error::VERSION($CLEAN_VERSION) of current package does not match your requested ref_name ($INPUT_REF)"
             exit 1
           fi
 
-      - name: "Build package"
-        run: |
-          ./ccex build
-      
       - name: "Upload artifact"
         uses: actions/upload-artifact@v4
         with:
           name: "wheel"
           path: "./dist/"
 
   publish-to-pypi:
+
     needs:
       - build-and-upload
     runs-on: ubuntu-22.04

.gitignore

@@ -5,6 +5,7 @@ __pycache__/
 # Distribution
 build/
 dist/
+*/_version.py
 *.egg-info/
 .eggs/
 

infra/scripts/build.sh

@@ -1 +1,9 @@
-python3 setup.py bdist_wheel --dist-dir dist
+#!/bin/bash
+
+# Install Required Package
+#
+# NOTE To add additional build dependencies, append to `requires` field of [build-system] in pyproject.toml 
+python3 -m pip install build
+
+# Build
+python3 -m build

pyproject.toml

@@ -0,0 +1,52 @@
+[build-system]
+requires = ["setuptools>=61.0", "versioningit"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "tico"
+dynamic = ["version"] # To use 'versioningit' to obtain version details
+description = "Convert Exported Torch Module To Circle"
+readme = "README.md"
+requires-python = ">=3.10.0"
+license = {file = "LICENSE"}
+dependencies = [
+    "circle-schema",
+    "packaging",
+    "cffi",
+    "torch",
+    "pyyaml",
+    "tqdm",
+]
+
+[project.scripts]
+pt2-to-circle = "tico.pt2_to_circle:main"
+
+[tool.setuptools]
+# Automatic package discovery (replaces the old find_packages role)
+packages = {find = {include = ["tico*"]}}
+
+# ==========================================
+# versioningit
+# ==========================================
+[tool.versioningit]
+default-version = "0.1.0"
+
+[tool.versioningit.vcs]
+method = "git"
+match = ["v*"] # Only recognize tags starting with 'v' (e.g., v0.1.0)
+
+[tool.versioningit.next-version]
+# 태그 이후 커밋이 발생하면 무조건 Minor 버전을 올림 (0.1.0 -> 0.2.0)
+method = "minor"
+
+[tool.versioningit.format]
+# 1. 정식 태그가 찍힌 경우: 0.1.0
+# 2. 태그 이후 커밋이 있는 경우: 0.2.0.dev260112 (다음버전 + .dev + 날짜)
+distance = "{next_version}.dev{committer_date:%y%m%d}"
+# 3. 로컬에서 수정 중인 파일이 있는 경우 (+dirty 추가)
+dirty = "{next_version}.dev{committer_date:%y%m%d}+dirty"
+distance-dirty = "{next_version}.dev{committer_date:%y%m%d}+dirty"
+
+[tool.versioningit.write]
+# 빌드 시 버전을 기록할 파일 (tico/__init__.py에서 참조 가능)
+file = "tico/_version.py"

setup.py

@@ -28,8 +28,8 @@
     "convert_from_pt2",
 ]
 
-# THIS LINE IS AUTOMATICALLY GENERATED BY setup.py
-__version__ = "0.1.0"
+# THIS LINE IS AUTOMATICALLY GENERATED
+__version__ = "0.2.0"
 
 MINIMUM_SUPPORTED_VERSION = "2.5.0"
 SECURE_TORCH_VERSION = "2.6.0"