Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v0.14.4 #352

Merged
merged 3 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions .github/workflows/edgetest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
pyproject.toml
2 changes: 1 addition & 1 deletion datacompy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ maintainers = [
{ name="Faisal Dosani", email="[email protected]" }
]
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",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions tests/test_polars.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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")

Expand Down
Loading