From 4ce1aa8f8bbeac1229b17527da9920f174995cf9 Mon Sep 17 00:00:00 2001 From: Adam Su Date: Fri, 29 May 2026 15:42:47 -0400 Subject: [PATCH 1/5] small change to trigger workflow --- .github/workflows/ci-workflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index b4076ff..afcf9f2 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -1,5 +1,6 @@ name: CI Workflow + on: push: branches: From 4377ddc1d474b26dd2ad85593095742a1aa746b5 Mon Sep 17 00:00:00 2001 From: Adam Su Date: Fri, 29 May 2026 15:42:47 -0400 Subject: [PATCH 2/5] small change to trigger CI workflow --- .github/workflows/ci-workflow.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index b4076ff..8b1795d 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -1,5 +1,6 @@ name: CI Workflow + on: push: branches: @@ -34,7 +35,7 @@ jobs: --cov-report=html - name: Upload coverage HTML report - uses: action/upload-artifact@v7 + uses: action/upload-artifact@v6 with: name: coverage-html path: htmlcov \ No newline at end of file From 441ba103beb2f620285b18061f9171ddfada4d07 Mon Sep 17 00:00:00 2001 From: Adam Su Date: Fri, 29 May 2026 16:39:44 -0400 Subject: [PATCH 3/5] added CI workflow using UV for comparison --- .github/workflows/ci-workflow_uv.yml | 45 ++++++++++++++++++++++++++++ .gitignore | 1 + pyproject-local.toml | 13 ++++++++ 3 files changed, 59 insertions(+) create mode 100644 .github/workflows/ci-workflow_uv.yml create mode 100644 pyproject-local.toml diff --git a/.github/workflows/ci-workflow_uv.yml b/.github/workflows/ci-workflow_uv.yml new file mode 100644 index 0000000..8a6b718 --- /dev/null +++ b/.github/workflows/ci-workflow_uv.yml @@ -0,0 +1,45 @@ +name: CI Workflow + + +on: + push: + branches: + - 'feature/**' + pull_request: + branches: + - 'main' + +jobs: + ci-jobs: + name: CI Job + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v6 + + - name: Install uv + uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0 + with: + enable-cache: true + + - name: Set up python 3.12 + uses: actions/setup-python@v6 + with: + python-version: '3.12' + python-version-file: "pyproject-local.toml" + + - name: Install dependencies + run: uv sync --all-extras --config-file pyproject-local.toml + + - name: Run pytest & generate HTML report + run: | + uv run pytest \ + --disable-warnings \ + --cov=./src \ + --cov-report=html + + - name: Upload coverage HTML report + uses: actions/upload-artifact@v7 + with: + name: coverage-html + path: htmlcov \ No newline at end of file diff --git a/.gitignore b/.gitignore index e566c51..cb5d67e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ scratch/** !scratch/README.md **/explorations/** **/!explorations/README.md +uv.lock \ No newline at end of file diff --git a/pyproject-local.toml b/pyproject-local.toml new file mode 100644 index 0000000..672b3e5 --- /dev/null +++ b/pyproject-local.toml @@ -0,0 +1,13 @@ +[project] +name = "databricks_dab" +version = "0.1.0" +description = "Add your description here" +readme = "README.md" +requires-python = ">=3.12" +dependencies = [ + "pandas>=3.0.3", + "pygments>=2.20.0", + "pyspark>=4.1.2", + "pytest>=9.0.3", + "pytest-cov>=7.1.0", +] From cecd3bb47c91487434b86409b0e1c1bb461beda9 Mon Sep 17 00:00:00 2001 From: Adam Su Date: Fri, 29 May 2026 16:39:44 -0400 Subject: [PATCH 4/5] added CI workflow using UV for comparison --- .github/workflows/ci-workflow_uv.yml | 44 ++++++++++++++++++++++++++++ .gitignore | 1 + pyproject.toml | 8 +++++ 3 files changed, 53 insertions(+) create mode 100644 .github/workflows/ci-workflow_uv.yml diff --git a/.github/workflows/ci-workflow_uv.yml b/.github/workflows/ci-workflow_uv.yml new file mode 100644 index 0000000..0a80164 --- /dev/null +++ b/.github/workflows/ci-workflow_uv.yml @@ -0,0 +1,44 @@ +name: CI Workflow with UV + + +on: + push: + branches: + - 'feature/**' + pull_request: + branches: + - 'main' + +jobs: + ci-jobs: + name: CI Job with UV + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v6 + + - name: Install uv + uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0 + with: + enable-cache: true + + - name: Set up python 3.12 + uses: actions/setup-python@v6 + with: + python-version: '3.12' + + - name: Install dependencies + run: uv sync --group local --all-extras + + - name: Run pytest & generate HTML report + run: | + uv run pytest \ + --disable-warnings \ + --cov=./src \ + --cov-report=html + + - name: Upload coverage HTML report + uses: actions/upload-artifact@v7 + with: + name: coverage-html + path: htmlcov \ No newline at end of file diff --git a/.gitignore b/.gitignore index e566c51..cb5d67e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ scratch/** !scratch/README.md **/explorations/** **/!explorations/README.md +uv.lock \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 2f815e3..674650a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,6 +21,14 @@ dev = [ "ipykernel", ] +local = [ + "pandas", + "pygments", + "pyspark", + "pytest", + "pytest-cov", +] + [project.scripts] main = "databricks_dab.main:main" From 6647b725e69c4e55bd059ebe0cb491224902f744 Mon Sep 17 00:00:00 2001 From: Adam Su Date: Fri, 29 May 2026 16:59:41 -0400 Subject: [PATCH 5/5] migrate to UV for CI --- .github/workflows/ci-workflow.yml | 19 +++++++----- .github/workflows/ci-workflow_uv.yml | 44 ---------------------------- pyproject-local.toml | 13 -------- requirements-pyspark.txt | 18 ------------ 4 files changed, 11 insertions(+), 83 deletions(-) delete mode 100644 .github/workflows/ci-workflow_uv.yml delete mode 100644 pyproject-local.toml delete mode 100644 requirements-pyspark.txt diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 413a467..28e3dd7 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -17,19 +17,22 @@ jobs: - name: Checkout code uses: actions/checkout@v6 - - name: Set up python 3.11 + - name: Install uv + uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0 + with: + enable-cache: true + + - name: Set up python 3.12 uses: actions/setup-python@v6 with: - python-version: '3.11' + python-version: '3.12' + + - name: Install dependencies + run: uv sync --group local --all-extras - - name: Install dependencies + pytest-html - run: | - python -m pip install --upgrade pip - pip install -r requirements-pyspark.txt - - name: Run pytest & generate HTML report run: | - pytest \ + uv run pytest \ --disable-warnings \ --cov=./src \ --cov-report=html diff --git a/.github/workflows/ci-workflow_uv.yml b/.github/workflows/ci-workflow_uv.yml deleted file mode 100644 index 0a80164..0000000 --- a/.github/workflows/ci-workflow_uv.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: CI Workflow with UV - - -on: - push: - branches: - - 'feature/**' - pull_request: - branches: - - 'main' - -jobs: - ci-jobs: - name: CI Job with UV - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v6 - - - name: Install uv - uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0 - with: - enable-cache: true - - - name: Set up python 3.12 - uses: actions/setup-python@v6 - with: - python-version: '3.12' - - - name: Install dependencies - run: uv sync --group local --all-extras - - - name: Run pytest & generate HTML report - run: | - uv run pytest \ - --disable-warnings \ - --cov=./src \ - --cov-report=html - - - name: Upload coverage HTML report - uses: actions/upload-artifact@v7 - with: - name: coverage-html - path: htmlcov \ No newline at end of file diff --git a/pyproject-local.toml b/pyproject-local.toml deleted file mode 100644 index 672b3e5..0000000 --- a/pyproject-local.toml +++ /dev/null @@ -1,13 +0,0 @@ -[project] -name = "databricks_dab" -version = "0.1.0" -description = "Add your description here" -readme = "README.md" -requires-python = ">=3.12" -dependencies = [ - "pandas>=3.0.3", - "pygments>=2.20.0", - "pyspark>=4.1.2", - "pytest>=9.0.3", - "pytest-cov>=7.1.0", -] diff --git a/requirements-pyspark.txt b/requirements-pyspark.txt deleted file mode 100644 index 1d3a102..0000000 --- a/requirements-pyspark.txt +++ /dev/null @@ -1,18 +0,0 @@ -coverage==7.8.0 -googleapis-common-protos==1.63.2 -grpcio==1.60.0 -grpcio-status==1.60.0 -iniconfig==2.1.0 -numpy==1.23.5 -packaging==25.0 -pandas==1.5.3 -pluggy==1.5.0 -protobuf==5.29.4 -py4j==0.10.9.7 -pyarrow==14.0.1 -pyspark==3.5.0 -pytest==8.3.5 -pytest-cov==6.1.1 -python-dateutil==2.9.0.post0 -pytz==2025.2 -six==1.17.0 \ No newline at end of file