From 2aa6890628c94b19e6a6b9f0c83aef968c0cb5d6 Mon Sep 17 00:00:00 2001 From: JacobDawang Date: Tue, 5 Nov 2024 08:38:43 -0700 Subject: [PATCH 1/6] Fix edgetest --- .github/workflows/edgetest.yml | 44 +++++++++++++--------------------- pyproject.toml | 2 +- 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/.github/workflows/edgetest.yml b/.github/workflows/edgetest.yml index e47ca6ff..2e666168 100644 --- a/.github/workflows/edgetest.yml +++ b/.github/workflows/edgetest.yml @@ -11,45 +11,33 @@ jobs: runs-on: ubuntu-latest name: running edgetest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: develop - + - name: Set up Python 3.10 - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: auto-update-conda: true python-version: '3.10' channels: conda-forge - + - name: Setup Java JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '8' distribution: 'adopt' - - name: Install edgetest - shell: bash -el {0} - run: | - conda install pip - conda install edgetest edgetest-conda - python -m pip install .[dev] - - - name: Run edgetest - shell: bash -el {0} - run: | - edgetest -c pyproject.toml --export + # - name: Install edgetest + # shell: bash -el {0} + # run: | + # conda install pip + # conda install edgetest edgetest-conda + # python -m pip install .[dev] - - name: Create Pull Request - uses: peter-evans/create-pull-request@v3 + - id: run-edgetest + uses: edgetest-dev/run-edgetest-action@v1.5 with: - branch: edgetest-patch - base: develop - delete-branch: true - title: Changes by run-edgetest action - commit-message: '[edgetest] automated change' - body: Automated changes by [run-edgetest-action](https://github.com/edgetest-dev/run-edgetest-action) GitHub action - add-paths: | - requirements.txt - setup.cfg - pyproject.toml \ No newline at end of file + edgetest-flags: '-c pyproject.toml --export' + base-branch: 'develop' + skip-pr: 'false' diff --git a/pyproject.toml b/pyproject.toml index 9c86c82f..0a2a0ce0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -138,7 +138,7 @@ ignore_missing_imports = true python_version = "3.10" conda_install = ["openjdk=8"] extras = ["dev"] -command = "pytest tests -m 'not integration'" +command = "pytest tests --ignore=tests/test_snowflake.py -m 'not integration' " upgrade = [ "pandas", "numpy", From df32f3f42dddce2b2d907501e85142dc4f78b90f Mon Sep 17 00:00:00 2001 From: JacobDawang Date: Tue, 5 Nov 2024 09:03:59 -0700 Subject: [PATCH 2/6] Fix pyproject --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0a2a0ce0..d7e31e88 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -138,7 +138,7 @@ ignore_missing_imports = true python_version = "3.10" conda_install = ["openjdk=8"] extras = ["dev"] -command = "pytest tests --ignore=tests/test_snowflake.py -m 'not integration' " +command = "pytest tests/ --ignore=tests/test_snowflake.py" upgrade = [ "pandas", "numpy", From e318f4f98fbfcd71b2e3f06ccb2ab92e91e5ee7b Mon Sep 17 00:00:00 2001 From: JacobDawang Date: Tue, 5 Nov 2024 09:08:17 -0700 Subject: [PATCH 3/6] Update action --- .github/workflows/edgetest.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/edgetest.yml b/.github/workflows/edgetest.yml index 2e666168..a0f5850f 100644 --- a/.github/workflows/edgetest.yml +++ b/.github/workflows/edgetest.yml @@ -8,12 +8,15 @@ on: workflow_dispatch: # allows manual dispatch jobs: edgetest: + permissions: + contents: write + pull-requests: write runs-on: ubuntu-latest name: running edgetest steps: - uses: actions/checkout@v4 with: - ref: develop + ref: ${{ github.ref_name }} - name: Set up Python 3.10 uses: conda-incubator/setup-miniconda@v3 @@ -28,16 +31,9 @@ jobs: java-version: '8' distribution: 'adopt' - # - name: Install edgetest - # shell: bash -el {0} - # run: | - # conda install pip - # conda install edgetest edgetest-conda - # python -m pip install .[dev] - - id: run-edgetest uses: edgetest-dev/run-edgetest-action@v1.5 with: edgetest-flags: '-c pyproject.toml --export' - base-branch: 'develop' + base-branch: ${{ github.ref_name }} skip-pr: 'false' From 09bffc751949e77c2b5c6dbbd013d5493e2de2c3 Mon Sep 17 00:00:00 2001 From: JacobDawang Date: Tue, 5 Nov 2024 09:38:38 -0700 Subject: [PATCH 4/6] Specify pyspark --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index d7e31e88..789974cc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -138,6 +138,7 @@ ignore_missing_imports = true python_version = "3.10" conda_install = ["openjdk=8"] extras = ["dev"] +deps = ["pyspark[connect]==3.5.1"] command = "pytest tests/ --ignore=tests/test_snowflake.py" upgrade = [ "pandas", From d03fee4135b0965be98e5beff4e7a5a7f423ade9 Mon Sep 17 00:00:00 2001 From: JacobDawang Date: Tue, 5 Nov 2024 09:51:58 -0700 Subject: [PATCH 5/6] Try manual again --- .github/workflows/edgetest.yml | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/.github/workflows/edgetest.yml b/.github/workflows/edgetest.yml index a0f5850f..cbf2ff03 100644 --- a/.github/workflows/edgetest.yml +++ b/.github/workflows/edgetest.yml @@ -31,9 +31,26 @@ jobs: java-version: '8' distribution: 'adopt' - - id: run-edgetest - uses: edgetest-dev/run-edgetest-action@v1.5 + - name: Install edgetest + shell: bash -el {0} + run: | + conda install pip + conda install edgetest edgetest-conda + python -m pip install .[dev] + + - name: Run edgetest + shell: bash -el {0} + run: | + edgetest -c pyproject.toml --export + + - name: Create Pull Request + uses: peter-evans/create-pull-request@v7 with: - edgetest-flags: '-c pyproject.toml --export' - base-branch: ${{ github.ref_name }} - skip-pr: 'false' + branch: edgetest-patch + base: ${{ github.ref_name }} + delete-branch: true + title: Changes by run-edgetest action + commit-message: '[edgetest] automated change' + body: Automated changes by [run-edgetest-action](https://github.com/edgetest-dev/run-edgetest-action) GitHub action + add-paths: | + pyproject.toml From 1e9df3694e95266e63f7deaa1b67488fead13e28 Mon Sep 17 00:00:00 2001 From: JacobDawang Date: Tue, 5 Nov 2024 10:00:14 -0700 Subject: [PATCH 6/6] Remove deps --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 789974cc..d7e31e88 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -138,7 +138,6 @@ ignore_missing_imports = true python_version = "3.10" conda_install = ["openjdk=8"] extras = ["dev"] -deps = ["pyspark[connect]==3.5.1"] command = "pytest tests/ --ignore=tests/test_snowflake.py" upgrade = [ "pandas",