From 59275c926b6b21e19a42301acde86cebee4c3e24 Mon Sep 17 00:00:00 2001 From: Jacob Dawang Date: Tue, 5 Nov 2024 11:29:21 -0700 Subject: [PATCH 1/3] Fix edgetest action (#349) * Fix edgetest * Fix pyproject * Update action * Specify pyspark * Try manual again * Remove deps --- .github/workflows/edgetest.yml | 25 +++++++++++++------------ pyproject.toml | 2 +- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/edgetest.yml b/.github/workflows/edgetest.yml index e47ca6ff..cbf2ff03 100644 --- a/.github/workflows/edgetest.yml +++ b/.github/workflows/edgetest.yml @@ -8,22 +8,25 @@ 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@v3 + - uses: actions/checkout@v4 with: - ref: develop - + ref: ${{ github.ref_name }} + - 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' @@ -34,22 +37,20 @@ jobs: 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@v3 + uses: peter-evans/create-pull-request@v7 with: branch: edgetest-patch - base: develop + 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: | - requirements.txt - setup.cfg - pyproject.toml \ No newline at end of file + pyproject.toml diff --git a/pyproject.toml b/pyproject.toml index 9c86c82f..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 -m 'not integration'" +command = "pytest tests/ --ignore=tests/test_snowflake.py" upgrade = [ "pandas", "numpy", From 8e61522137a60e2f29c1aae0a4d7f8dd19c6ef9f Mon Sep 17 00:00:00 2001 From: Gladys Teh <97971054+gladysteh99@users.noreply.github.com> Date: Tue, 5 Nov 2024 14:02:13 -0500 Subject: [PATCH 2/3] Update polars to 1.12.0 (#350) * upgrade polars to 1.12.0 * upperpin --- pyproject.toml | 2 +- tests/test_polars.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d7e31e88..f381dc54 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ maintainers = [ { name="Faisal Dosani", email="faisal.dosani@capitalone.com" } ] license = {text = "Apache Software License"} -dependencies = ["pandas<=2.2.3,>=0.25.0", "numpy<=2.1.2,>=1.22.0", "ordered-set<=4.1.0,>=4.0.2", "fugue<=0.9.1,>=0.8.7", "polars<=1.7.0,>=0.20.4"] +dependencies = ["pandas<=2.2.3,>=0.25.0", "numpy<=2.1.2,>=1.22.0", "ordered-set<=4.1.0,>=4.0.2", "fugue<=0.9.1,>=0.8.7", "polars<=1.12.0,>=0.20.4"] requires-python = ">=3.9.0" classifiers = [ "Intended Audience :: Developers", diff --git a/tests/test_polars.py b/tests/test_polars.py index 779974b0..90205036 100644 --- a/tests/test_polars.py +++ b/tests/test_polars.py @@ -387,7 +387,7 @@ def test_compare_df_setter_bad(): with raises(ValueError, match="df1 must have all columns from join_columns"): PolarsCompare(df, df.clone(), ["b"]) with raises( - DuplicateError, match="column with name 'a' has more than one occurrences" + DuplicateError, match="column with name 'a' has more than one occurrence" ): PolarsCompare(df_same_col_names, df_same_col_names.clone(), ["a"]) assert PolarsCompare(df_dupe, df_dupe.clone(), ["a", "b"]).df1.equals(df_dupe) @@ -419,7 +419,7 @@ def test_compare_df_setter_bad_index(): with raises(TypeError, match="df1 must be a Polars DataFrame"): PolarsCompare("a", "a", join_columns="a") with raises( - DuplicateError, match="column with name 'a' has more than one occurrences" + DuplicateError, match="column with name 'a' has more than one occurrence" ): PolarsCompare(df, df.clone(), join_columns="a") From a3a97106e6055fa8f01ddb02be21676c57d567e4 Mon Sep 17 00:00:00 2001 From: Faisal Date: Wed, 6 Nov 2024 11:01:21 -0400 Subject: [PATCH 3/3] bump version (#351) --- datacompy/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacompy/__init__.py b/datacompy/__init__.py index e2d150e3..58691baf 100644 --- a/datacompy/__init__.py +++ b/datacompy/__init__.py @@ -18,7 +18,7 @@ Then extended to carry that functionality over to Spark Dataframes. """ -__version__ = "0.14.3" +__version__ = "0.14.4" import platform from warnings import warn