From be00621e40f52f9fc544f49bcb3f8ed277e25a49 Mon Sep 17 00:00:00 2001 From: ckunki Date: Tue, 9 Jul 2024 16:40:17 +0200 Subject: [PATCH 1/6] Prepare release 0.12.0 --- doc/changes/changelog.md | 2 ++ doc/changes/changes_0.12.0.md | 22 ++++++++++++++++++++++ doc/changes/unreleased.md | 21 --------------------- exasol/bucketfs/version.py | 2 +- pyproject.toml | 2 +- 5 files changed, 26 insertions(+), 23 deletions(-) create mode 100644 doc/changes/changes_0.12.0.md diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md index 47a7b32d..5366190c 100644 --- a/doc/changes/changelog.md +++ b/doc/changes/changelog.md @@ -1,6 +1,7 @@ # πŸ“ Changes * [unreleased](unreleased.md) +* [0.12.0](changes_0.12.0.md) * [0.11.0](changes_0.11.0.md) * [0.10.0](changes_0.10.0.md) * [0.9.0](changes_0.9.0.md) @@ -18,6 +19,7 @@ hidden: --- unreleased +changes_0.12.0 changes_0.11.0 changes_0.10.0 changes_0.9.0 diff --git a/doc/changes/changes_0.12.0.md b/doc/changes/changes_0.12.0.md new file mode 100644 index 00000000..2dbb7856 --- /dev/null +++ b/doc/changes/changes_0.12.0.md @@ -0,0 +1,22 @@ +# 0.12.0 - 2024-07-09 + +## Summary + +The current release adds a dependency to plugin `pytest_exasol_saas` and replaces individual test fixtures by those provided by the plugin. + +Additionally the release fixes vulnerabilities by updating dependencies. + +## Security + +* Fixed vulnerabilities by updating dependencies + * Vulnerability CVE-2024-21503 in transitive dependency via `exasol-toolbox` to `black` in versions below `24.3.0` + * Vulnerability CVE-2024-35195 in dependency `requests` in versions below `2.32.0` + +## Refactorings + +* #141: Used plugin `pytest_exasol_saas` + +## Documentation + +* #144: Added comment on using fixtures from pytest-plugin `pytest-exasol-saas` +* #147: Added documentation for the SaaS and the PathLike interface. \ No newline at end of file diff --git a/doc/changes/unreleased.md b/doc/changes/unreleased.md index 6559a923..79e701b8 100644 --- a/doc/changes/unreleased.md +++ b/doc/changes/unreleased.md @@ -1,22 +1 @@ # Unreleased - -## Summary - -The current release adds a dependency to plugin `pytest_exasol_saas` and replaces individual test fixtures by those provided by the plugin. - -Additionally the release fixes vulnerabilities by updating dependencies. - -## Security - -* Fixed vulnerabilities by updating dependencies - * Vulnerability CVE-2024-21503 in transitive dependency via `exasol-toolbox` to `black` in versions below `24.3.0` - * Vulnerability CVE-2024-35195 in dependency `requests` in versions below `2.32.0` - -## Refactorings - -* #141: Used plugin `pytest_exasol_saas` - -## Documentation - -* #144: Added comment on using fixtures from pytest-plugin `pytest-exasol-saas` -* #147: Added documentation for the SaaS and the PathLike interface. diff --git a/exasol/bucketfs/version.py b/exasol/bucketfs/version.py index 2acfbddd..14e287e5 100644 --- a/exasol/bucketfs/version.py +++ b/exasol/bucketfs/version.py @@ -5,6 +5,6 @@ # Do not edit this file manually! # If you need to change the version, do so in the project.toml, e.g. by using `poetry version X.Y.Z`. MAJOR = 0 -MINOR = 11 +MINOR = 12 PATCH = 0 VERSION = f"{MAJOR}.{MINOR}.{PATCH}" diff --git a/pyproject.toml b/pyproject.toml index 62c764ce..f5e90768 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ packages = [ {include = "exasol"}, {include = "exasol_bucketfs_utils_python"} ] -version = "0.11.0" +version = "0.12.0" description = "BucketFS utilities for the Python programming language" license = "MIT" From 421d4624c12fa7726866e857b920240b03619780 Mon Sep 17 00:00:00 2001 From: ckunki Date: Tue, 9 Jul 2024 16:50:11 +0200 Subject: [PATCH 2/6] Simplified workflows --- .github/workflows/build-and-publish.yml | 2 +- .github/workflows/ci.yml | 7 ----- .github/workflows/pr-merge.yml | 36 ------------------------- 3 files changed, 1 insertion(+), 44 deletions(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 7cdd1518..4547ec1f 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -9,7 +9,7 @@ on: jobs: cd-job: - name: Continues Delivery + name: Continuous Delivery runs-on: ubuntu-latest steps: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c32bfe55..cc868fce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,14 +1,7 @@ name: CI on: - push: - branches-ignore: - - "github-pages/*" - - "gh-pages/*" - - "main" - - "master" pull_request: - types: [opened, reopened] schedule: # β€œAt 00:00 on every 7th day-of-month from 1 through 31.” (https://crontab.guru) - cron: "0 0 1/7 * *" diff --git a/.github/workflows/pr-merge.yml b/.github/workflows/pr-merge.yml index b859f4f1..7fb7b2f8 100644 --- a/.github/workflows/pr-merge.yml +++ b/.github/workflows/pr-merge.yml @@ -8,10 +8,6 @@ on: jobs: - ci-job: - name: Checks - uses: ./.github/workflows/checks.yml - publish-docs: name: Publish Documentation uses: ./.github/workflows/gh-pages.yml @@ -19,35 +15,3 @@ jobs: metrics: needs: [ ci-job ] uses: ./.github/workflows/report.yml - - tests-job: - name: Tests (Python-${{ matrix.python-version }}) - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: ["3.8", "3.9", "3.10"] - - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - - uses: abatilo/actions-poetry@v3.0.0 - with: - poetry-version: 1.2.2 - - - name: Install Project - run: poetry install - - - name: Checkout ITDE - run: git clone https://github.com/exasol/integration-test-docker-environment.git - working-directory: .. - - - name: Start EXASOL Test-Environment - run: ./start-test-env spawn-test-environment --environment-name test --database-port-forward 8888 --bucketfs-port-forward 6666 --db-mem-size 4GB - working-directory: ../integration-test-docker-environment - - - name: Run Tests - run: poetry run pytest tests - From 69317428ed77192744dc5b8de39dbd198f4610a0 Mon Sep 17 00:00:00 2001 From: ckunki Date: Tue, 9 Jul 2024 16:51:37 +0200 Subject: [PATCH 3/6] Renamed workflows --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc868fce..7643f7dc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,6 +53,7 @@ jobs: run: true slow-test-detection: + name: Run Slow or Expensive Tests (e.g. SaaS)? runs-on: ubuntu-latest steps: - name: Detect Slow Tests @@ -61,6 +62,7 @@ jobs: slow-tests run-slow-tests: + name: Run Slow or Expensive Tests (e.g. SaaS) if Requested runs-on: ubuntu-latest needs: [ slow-test-detection ] From 86f82225c1950e5a9f39f92da60d863cd62ba175 Mon Sep 17 00:00:00 2001 From: ckunki Date: Tue, 9 Jul 2024 17:00:11 +0200 Subject: [PATCH 4/6] Removed tests from GitHub workflow checks.yml --- .github/workflows/checks.yml | 69 +++--------------------------------- 1 file changed, 5 insertions(+), 64 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 452ac05b..ffab25e1 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -5,7 +5,7 @@ on: workflow_call jobs: version-check-job: - name: Version Check + name: Version Check & Build Documentation runs-on: ubuntu-latest steps: @@ -20,24 +20,12 @@ jobs: - name: Check Version(s) run: poetry run version-check exasol/bucketfs/version.py - build-documentation-job: - name: Build Documentation - needs: [version-check-job] - runs-on: ubuntu-latest - - steps: - - name: SCM Checkout - uses: actions/checkout@v4 - - - name: Setup Python & Poetry Environment - uses: exasol/python-toolbox/.github/actions/python-environment@0.12.0 - - name: Build Documentation run: | poetry run python -m nox -s build-docs lint-job: - name: Linting (Python-${{ matrix.python-version }}) + name: Linting and Type checks (Python-${{ matrix.python-version }}) needs: [version-check-job] runs-on: ubuntu-latest strategy: @@ -57,58 +45,11 @@ jobs: - name: Run Tests run: poetry run nox -s lint - - name: Upload Artifacts - uses: actions/upload-artifact@v3 - with: - name: .lint.txt - path: .lint.txt - - type-check-job: - name: Type Checking (Python-${{ matrix.python-version }}) - needs: [version-check-job] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] - - steps: - - name: SCM Checkout - uses: actions/checkout@v4 - - - name: Setup Python & Poetry Environment - uses: exasol/python-toolbox/.github/actions/python-environment@0.12.0 - with: - python-version: ${{ matrix.python-version }} - - - name: Run Tests + - name: Run type-check run: poetry run nox -s type-check - tests-job: - name: Tests (Python-${{ matrix.python-version }}, Exasol-${{ matrix.exasol-version}}) - needs: [build-documentation-job, lint-job, type-check-job] - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] - exasol-version: ["7.1.9"] - - steps: - - name: SCM Checkout - uses: actions/checkout@v4 - - - name: Setup Python & Poetry Environment - uses: exasol/python-toolbox/.github/actions/python-environment@0.12.0 - with: - python-version: ${{ matrix.python-version }} - - - name: Run Tests - run: poetry run nox -s coverage -- -- --db-version ${{ matrix.exasol-version }} - - name: Upload Artifacts uses: actions/upload-artifact@v3 with: - name: .coverage - path: .coverage - + name: .lint.txt + path: .lint.txt From be4beac3d610cc4359af901fa24ad4b9b6a863b2 Mon Sep 17 00:00:00 2001 From: ckunki Date: Thu, 11 Jul 2024 08:59:53 +0200 Subject: [PATCH 5/6] Fixed coverage metrics --- .github/workflows/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7643f7dc..19dc3313 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,13 @@ jobs: working-directory: ../integration-test-docker-environment - name: Run Tests - run: poetry run pytest tests + run: poetry run nox -s coverage + + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: .coverage + path: .coverage metrics: needs: [ fast-tests ] From 128e5a05b87fa8b9bdca0a46938167c70109af71 Mon Sep 17 00:00:00 2001 From: ckunki Date: Thu, 11 Jul 2024 09:23:25 +0200 Subject: [PATCH 6/6] Updated release date --- doc/changes/changes_0.12.0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/changes/changes_0.12.0.md b/doc/changes/changes_0.12.0.md index 2dbb7856..a1dfe19e 100644 --- a/doc/changes/changes_0.12.0.md +++ b/doc/changes/changes_0.12.0.md @@ -1,4 +1,4 @@ -# 0.12.0 - 2024-07-09 +# 0.12.0 - 2024-07-11 ## Summary