From 95d188c782b3762491c1181363c81745f6b8548c Mon Sep 17 00:00:00 2001 From: Florian Maas Date: Wed, 17 Jul 2024 06:27:03 +0200 Subject: [PATCH 1/2] add tests for multiple versions of pyspark fix fix try fix try fix restore keys --- .github/actions/setup-poetry-env/action.yml | 14 +++++++-- .github/workflows/ci.yml | 9 ++++++ CHANGELOG.md | 35 +++++++++++++++++++++ 3 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 CHANGELOG.md diff --git a/.github/actions/setup-poetry-env/action.yml b/.github/actions/setup-poetry-env/action.yml index afd21bf..7969e6d 100644 --- a/.github/actions/setup-poetry-env/action.yml +++ b/.github/actions/setup-poetry-env/action.yml @@ -6,12 +6,15 @@ inputs: required: false description: "The python version to use" default: "3.11" + pyspark-version: + required: false + description: "The pyspark version to use" + default: "3.5.1" with-docs: required: false description: "Install the docs dependency group" default: 'false' - runs: using: "composite" steps: @@ -40,7 +43,7 @@ runs: uses: actions/cache@v3 with: path: .venv - key: venv-${{ runner.os }}-${{ inputs.python-version }}-${{ inputs.with-docs }}-${{ hashFiles('poetry.lock') }} + key: venv-${{ runner.os }}-${{ inputs.python-version }}-${{ inputs.pyspark-version }}-${{ inputs.with-docs }}-${{ hashFiles('poetry.lock') }} - name: Install dependencies run: | @@ -49,5 +52,12 @@ runs: else poetry install --no-interaction fi + poetry run pip install pyspark==${{ inputs.pyspark-version }} shell: bash if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' + + - name: Print python and pyspark version + run: | + poetry run python --version + poetry run pyspark --version + shell: bash diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 520bd14..8739de5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,6 +27,14 @@ jobs: strategy: matrix: python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + pyspark-version: ["3.4.3", "3.5.1"] + include: + - python-version: "3.8" + pyspark-version: "3.3.4" + - python-version: "3.9" + pyspark-version: "3.3.4" + - python-version: "3.10" + pyspark-version: "3.3.4" fail-fast: false defaults: run: @@ -39,6 +47,7 @@ jobs: uses: ./.github/actions/setup-poetry-env with: python-version: ${{ matrix.python-version }} + pyspark-version: ${{ matrix.pyspark-version }} - name: Run tests run: poetry run pytest tests diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..88ef35b --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,35 @@ +# Changelog + +## 0.11.0 + +### Breaking changes + +chispa 0.11.0 drops support for Python 3.7 + + +* Drop support for Python 3.7 and Pyspark 2.x and remove vendored dependency on six by @fpgmaas in https://github.com/MrPowers/chispa/pull/80 +* chore: refresh poetry lock by @fpgmaas in https://github.com/MrPowers/chispa/pull/108 +* Add unit tests for multiple python versions to CI stage by @fpgmaas in https://github.com/MrPowers/chispa/pull/81 +* Add makefile by @fpgmaas in https://github.com/MrPowers/chispa/pull/103 +* Improve pyproject.toml by @fpgmaas in https://github.com/MrPowers/chispa/pull/105 +* Add mkdocs-material by @fpgmaas in https://github.com/MrPowers/chispa/pull/104 +* chore: Use Python `.gitignore` template by @fpgmaas in https://github.com/MrPowers/chispa/pull/113 +* chore: add PR and issue templates by @fpgmaas in https://github.com/MrPowers/chispa/pull/115 +* feat: remove vendored dependency prettytable by @fpgmaas in https://github.com/MrPowers/chispa/pull/114 +* chore: add test coverage commands by @fpgmaas in https://github.com/MrPowers/chispa/pull/112 +* Add pre-commit hooks and ruff by @fpgmaas in https://github.com/MrPowers/chispa/pull/106 +* Delete .coverage.Florians-MacBook-Pro.local.18837.XACWbthx by @fpgmaas in https://github.com/MrPowers/chispa/pull/117 +* chore: enable ruff rule `E712` by @fpgmaas in https://github.com/MrPowers/chispa/pull/118 +* chore: enable `F401` and `F403` by @fpgmaas in https://github.com/MrPowers/chispa/pull/120 +* chore: enable ruff `F841` by @fpgmaas in https://github.com/MrPowers/chispa/pull/121 +* Add `make check` command by @fpgmaas in https://github.com/MrPowers/chispa/pull/122 +* chore: enable ruff `I` (`isort`) by @fpgmaas in https://github.com/MrPowers/chispa/pull/125 +* chore: add more precommit hooks by @fpgmaas in https://github.com/MrPowers/chispa/pull/123 +* chore: enable ruff rules `RUF` and `UP` by @fpgmaas in https://github.com/MrPowers/chispa/pull/126 +* feat: NOTICE-binary file by @SemyonSinchenko in https://github.com/MrPowers/chispa/pull/128 +* feat: Introduce `FormattingConfig` and deprecate `DefaultFormats` by @fpgmaas in https://github.com/MrPowers/chispa/pull/127 + +## New Contributors +* @fpgmaas made their first contribution in https://github.com/MrPowers/chispa/pull/80 + +**Full Changelog**: https://github.com/MrPowers/chispa/compare/v0.10.0...v0.11.0 \ No newline at end of file From 81b8b9e8aa9b4aa5b2bef15b82265f9d14ff447d Mon Sep 17 00:00:00 2001 From: Florian Maas Date: Mon, 29 Jul 2024 18:21:57 +0200 Subject: [PATCH 2/2] remove file that was added by accident --- .github/workflows/ci.yml | 1 + CHANGELOG.md | 35 ----------------------------------- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8739de5..2fc020f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,7 @@ on: types: [opened, synchronize, reopened] push: branches: [main] + workflow_dispatch: jobs: quality: diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 88ef35b..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,35 +0,0 @@ -# Changelog - -## 0.11.0 - -### Breaking changes - -chispa 0.11.0 drops support for Python 3.7 - - -* Drop support for Python 3.7 and Pyspark 2.x and remove vendored dependency on six by @fpgmaas in https://github.com/MrPowers/chispa/pull/80 -* chore: refresh poetry lock by @fpgmaas in https://github.com/MrPowers/chispa/pull/108 -* Add unit tests for multiple python versions to CI stage by @fpgmaas in https://github.com/MrPowers/chispa/pull/81 -* Add makefile by @fpgmaas in https://github.com/MrPowers/chispa/pull/103 -* Improve pyproject.toml by @fpgmaas in https://github.com/MrPowers/chispa/pull/105 -* Add mkdocs-material by @fpgmaas in https://github.com/MrPowers/chispa/pull/104 -* chore: Use Python `.gitignore` template by @fpgmaas in https://github.com/MrPowers/chispa/pull/113 -* chore: add PR and issue templates by @fpgmaas in https://github.com/MrPowers/chispa/pull/115 -* feat: remove vendored dependency prettytable by @fpgmaas in https://github.com/MrPowers/chispa/pull/114 -* chore: add test coverage commands by @fpgmaas in https://github.com/MrPowers/chispa/pull/112 -* Add pre-commit hooks and ruff by @fpgmaas in https://github.com/MrPowers/chispa/pull/106 -* Delete .coverage.Florians-MacBook-Pro.local.18837.XACWbthx by @fpgmaas in https://github.com/MrPowers/chispa/pull/117 -* chore: enable ruff rule `E712` by @fpgmaas in https://github.com/MrPowers/chispa/pull/118 -* chore: enable `F401` and `F403` by @fpgmaas in https://github.com/MrPowers/chispa/pull/120 -* chore: enable ruff `F841` by @fpgmaas in https://github.com/MrPowers/chispa/pull/121 -* Add `make check` command by @fpgmaas in https://github.com/MrPowers/chispa/pull/122 -* chore: enable ruff `I` (`isort`) by @fpgmaas in https://github.com/MrPowers/chispa/pull/125 -* chore: add more precommit hooks by @fpgmaas in https://github.com/MrPowers/chispa/pull/123 -* chore: enable ruff rules `RUF` and `UP` by @fpgmaas in https://github.com/MrPowers/chispa/pull/126 -* feat: NOTICE-binary file by @SemyonSinchenko in https://github.com/MrPowers/chispa/pull/128 -* feat: Introduce `FormattingConfig` and deprecate `DefaultFormats` by @fpgmaas in https://github.com/MrPowers/chispa/pull/127 - -## New Contributors -* @fpgmaas made their first contribution in https://github.com/MrPowers/chispa/pull/80 - -**Full Changelog**: https://github.com/MrPowers/chispa/compare/v0.10.0...v0.11.0 \ No newline at end of file