Use uv instead of flit

Signed-off-by: Yu Ishikawa <[email protected]>

Author: yu-iskw

.github/workflows/publish.yml

@@ -12,33 +12,19 @@ jobs:
       run:
         shell: bash
     steps:
-      - name: Dump GitHub context
-        env:
-          GITHUB_CONTEXT: ${{ toJson(github) }}
-        run: echo "$GITHUB_CONTEXT"
       - uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: "3.9"
-      - uses: actions/cache@v4
-        id: cache
-        with:
-          path: ${{ env.pythonLocation }}
-          key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-publish
-      - name: Install Flit
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: bash dev/setup.sh
+      - name: Install uv
+        run: |
+          pip install -r requirements.setup.txt
       - name: Publish
         env:
-          # SEE https://packaging.python.org/en/latest/specifications/pypirc/?highlight=token#using-a-pypi-token
-          FLIT_USERNAME: __token__
-          FLIT_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
-        run: bash dev/publish.sh "pypi"
-      - name: Dump GitHub context
-        env:
-          GITHUB_CONTEXT: ${{ toJson(github) }}
-        run: echo "$GITHUB_CONTEXT"
+          UV_PUBLISH_TOKEN: "${{ secrets.PYPI_API_TOKEN }}"
+        run: |
+          bash dev/publish.sh "pypi"
 
   test-published-package:
     needs:
@@ -48,18 +34,14 @@ jobs:
       run:
         shell: bash
     steps:
-      - name: Dump GitHub context
-        env:
-          GITHUB_CONTEXT: ${{ toJson(github) }}
-        run: echo "$GITHUB_CONTEXT"
       - uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: "3.9"
-      - name: Install packages
+      - name: Install package
         run: |
           python3 -m pip install -U dbt-artifacts-parser
-      - name: Test pacakge
+      - name: Test package
         run: |
           python -c 'import dbt_artifacts_parser; print(dbt_artifacts_parser.__version__)'

.github/workflows/test-publish.yml

@@ -7,57 +7,38 @@ on:
         description: "dbt-artifacts-parser version"
         required: true
 
-
 jobs:
   publish:
     runs-on: ubuntu-latest
     defaults:
       run:
         shell: bash
     steps:
-      - name: Dump GitHub context
-        env:
-          GITHUB_CONTEXT: ${{ toJson(github) }}
-        run: echo "$GITHUB_CONTEXT"
       - uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: "3.9"
-      - uses: actions/cache@v4
-        id: cache
-        with:
-          path: ${{ env.pythonLocation }}
-          key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-publish
-      - name: Install Flit
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: bash dev/setup.sh
+      - name: Install uv
+        run: |
+          pip install -r requirements.setup.txt
       - name: Test publish
         env:
-          # SEE https://packaging.python.org/en/latest/specifications/pypirc/?highlight=token#using-a-pypi-token
-          FLIT_USERNAME: __token__
-          FLIT_PASSWORD: ${{ secrets.TESTPYPI_API_TOKEN }}
-        run: bash dev/publish.sh "testpypi"
-      - name: Dump GitHub context
-        env:
-          GITHUB_CONTEXT: ${{ toJson(github) }}
-        run: echo "$GITHUB_CONTEXT"
+          UV_PUBLISH_TOKEN: "${{ secrets.TESTPYPI_API_TOKEN }}"
+        run: |
+          bash dev/publish.sh testpypi
 
   test-published-package:
     needs:
       - publish
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
     defaults:
       run:
         shell: bash
-    strategy:
-      matrix:
-        python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11" ]
     steps:
-      - name: Dump GitHub context
-        env:
-          GITHUB_CONTEXT: ${{ toJson(github) }}
-        run: echo "$GITHUB_CONTEXT"
       - uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v5

.github/workflows/test.yml

@@ -33,8 +33,8 @@ jobs:
       - uses: actions/cache@v4
         id: cache
         with:
-          path: ${{ env.pythonLocation }}
-          key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test
+          path: "${{ env.pythonLocation }}"
+          key: "${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test"
       - name: Install Flit
         if: steps.cache.outputs.cache-hit != 'true'
         run: bash dev/setup.sh

Makefile

@@ -5,7 +5,7 @@ setup: setup-python setup-pre-commit
 # Set up the python environment.
 .PHONY: setup-python
 setup-python:
-	bash ./dev/setup.sh --deps "develop"
+	bash ./dev/setup.sh --deps "development"
 
 # Set up the pre-commit hooks.
 .PHONY: setup-pre-commit
@@ -53,7 +53,7 @@ test:
 # Build the package
 .PHONY: build
 build: clean lint test
-	flit build
+	python -m build
 
 # Clean the environment
 .PHONY: clean

dbt_artifacts_parser/__init__.py

@@ -17,4 +17,3 @@
 """
 A dbt artifacts parser in python
 """
-__version__ = "0.8.0"

dev/publish.sh

@@ -13,25 +13,29 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-set -e
+set -Eo pipefail
 set -x
 
-SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
+SCRIPT_FILE="$(readlink -f "$0")"
+SCRIPT_DIR="$(dirname "$SCRIPT_FILE")"
 MODULE_DIR="$(dirname "$SCRIPT_DIR")"
 
-cd "$MODULE_DIR"
+cd "$MODULE_DIR" || exit
 
 # Arguments
 target=${1:?"target is not set"}
 
-# SEE https://flit.readthedocs.io/en/latest/reproducible.html
-SOURCE_DATE_EPOCH=$(date +%s)
-export SOURCE_DATE_EPOCH
+# Ensure uv is installed
+pip install uv
 
-if [[ "$target" == "pypi" ]] ; then
-  flit publish --repository "${target}" --pypirc "${MODULE_DIR}/.pypirc" --setup-py
-elif [[ "$target" == "testpypi" ]] ; then
-  flit publish --repository "${target}" --pypirc "${MODULE_DIR}/.pypirc" --setup-py
+# Build the package first
+uv build
+
+# Publish to the specified target
+if [[ "$target" == "pypi" ]]; then
+  uv publish
+elif [[ "$target" == "testpypi" ]]; then
+  uv publish --publish-url "https://test.pypi.org/legacy/"
 else
   echo "No such target ${target}"
   exit 1

dev/setup.sh

@@ -13,14 +13,54 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-set -e
+set -Eeuo pipefail
 
 # Constants
 SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
-MODULE_DIR="$(dirname "$SCRIPT_DIR")"
+MODULE_DIR="$(dirname "${SCRIPT_DIR}")"
 
-cd "$MODULE_DIR"
+# Arguments
+deps="production"
+use_venv=false
+while (($# > 0)); do
+  if [[ "$1" == "--use-venv" ]]; then
+    use_venv=true
+    shift 1
+  elif [[ "$1" == "--deps" ]]; then
+    if [[ "$2" != "production" && "$2" != "development" ]]; then
+      echo "Error: deps must be one of 'production' or 'development'"
+      exit 1
+    fi
+    deps="$2"
+    shift 2
+  else
+    echo "Unknown argument: $1"
+    exit 1
+  fi
+done
 
-FLIT_VERSION="3.9.0"
-pip install -U flit=="$FLIT_VERSION"
-flit install --deps develop --symlink
+# Change to the module directory
+cd "${MODULE_DIR}"
+
+# Install uv and dependencies
+pip install --force-reinstall -r "${MODULE_DIR}/requirements.setup.txt"
+
+if [[ "${use_venv}" == true ]]; then
+  # Create virtual environment
+  uv venv
+  # Activate virtual environment
+  if [[ -f .venv/bin/activate ]]; then
+    # shellcheck disable=SC1091
+    source .venv/bin/activate
+  else
+    echo "Error: .venv/bin/activate not found"
+    exit 1
+  fi
+fi
+
+# Install package and dependencies
+if [[ "${deps}" == "production" ]]; then
+  uv pip install --force-reinstall -e "."
+else
+  uv pip install --force-reinstall -e ".[dev,test]"
+fi

pyproject.toml

@@ -1,29 +1,13 @@
 [build-system]
-requires = ["flit_core >=3.2,<4"]
-build-backend = "flit_core.buildapi"
-
-[tool.flit.module]
-name = "dbt_artifacts_parser"
-
-[tool.flit.sdist]
-exclude = [
-    ".github/",
-    ".gitignore",
-    ".pre-commit-config.yaml",
-    ".style.yapf",
-    ".pylintrc",
-    ".pypirc",
-    "Makefile",
-    "dev/",
-    "tests/",
-]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 
 [project]
 name = "dbt-artifacts-parser"
 authors = [{name = "yu-iskw"}]
 readme = "README.md"
 license = {file = "LICENSE"}
-requires-python = ">=3.7.0"
+requires-python = ">=3.8.0"
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Information Technology",
@@ -42,7 +26,8 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Typing :: Typed",
 ]
-dynamic = ["version", "description"]
+version = "0.8.0"
+dynamic = ["description"]
 dependencies = [
     "pydantic >=2.0,<3.0",
 ]
@@ -61,7 +46,7 @@ test = [
     "yapf >=0.29.0",
 ]
 dev = [
-    "flit ==3.9.0",
+    "uv>=0.5,<0.6",
     "build ==1.2.2",
     "yapf >=0.29.0",
     "pyyaml >=5.3",
@@ -72,3 +57,24 @@ dev = [
 
 [tool.isort]
 profile = "black"
+
+[tool.hatch.build.targets.sdist]
+exclude = [
+    ".github/",
+    ".gitignore",
+    ".pre-commit-config.yaml",
+    ".style.yapf",
+    ".pylintrc",
+    ".pypirc",
+    "Makefile",
+    "dev/",
+    "tests/",
+    ".DS_Store",
+    ".vscode/",
+    ".trunk/",
+    ".pytest_cache/",
+    ".mypy_cache/",
+    "dist/",
+    "test.json",
+    "renovate.json"
+]

requirements.setup.txt

@@ -0,0 +1 @@
+uv>=0.5,<0.6