Skip to content
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
35 changes: 20 additions & 15 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
/exasol/saas/client/openapi/** linguist-generated
/exasol/saas/version.py linguist-generated
/.github/workflows/build-and-publish.yml linguist-generated
/.github/workflows/cd.yml linguist-generated
/.github/workflows/check-api-outdated.yml linguist-generated
/.github/workflows/check-release-tag.yml linguist-generated
/.github/workflows/checks.yml linguist-generated
/.github/workflows/ci.yml linguist-generated
/.github/workflows/gh-pages.yml linguist-generated
/.github/workflows/matrix-all.yml linguist-generated
/.github/workflows/matrix-exasol.yml linguist-generated
/.github/workflows/matrix-python.yml linguist-generated
/.github/workflows/merge-gate.yml linguist-generated
/.github/workflows/pr-merge.yml linguist-generated
/.github/workflows/report.yml linguist-generated
/exasol/saas/client/openapi/** linguist-generated=true

# Core Data and Locks
poetry.lock linguist-generated=true
/doc/changes/changelog.md linguist-generated=true

# PTB GitHub Workflows (CI/CD & Publishing)
/.github/workflows/build-and-publish.yml linguist-generated=true
/.github/workflows/cd.yml linguist-generated=true
/.github/workflows/check-api-outdated.yml linguist-generated=true
/.github/workflows/check-release-tag.yml linguist-generated=true
/.github/workflows/checks.yml linguist-generated=true
/.github/workflows/ci.yml linguist-generated=true
/.github/workflows/gh-pages.yml linguist-generated=true
/.github/workflows/matrix-all.yml linguist-generated=true
/.github/workflows/matrix-exasol.yml linguist-generated=true
/.github/workflows/matrix-python.yml linguist-generated=true
/.github/workflows/merge-gate.yml linguist-generated=true
/.github/workflows/pr-merge.yml linguist-generated=true
/.github/workflows/report.yml linguist-generated=true
2 changes: 1 addition & 1 deletion .github/workflows/build-and-publish.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/check-release-tag.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 8 additions & 30 deletions .github/workflows/checks.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .github/workflows/ci.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .github/workflows/gh-pages.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/matrix-all.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/matrix-exasol.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/matrix-python.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions .github/workflows/merge-gate.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 1 addition & 17 deletions .github/workflows/report.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions .github/workflows/slow-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ jobs:

- name: Set up Python & Poetry Environment
id: set-up-python-and-poetry-environment
uses: exasol/python-toolbox/.github/actions/python-environment@v6
uses: exasol/python-toolbox/.github/actions/python-environment@v7
with:
python-version: "3.10"
poetry-version: "2.3.0"

- name: Run Tests and Collect Coverage
- name: Run Integration Tests
id: run-integration-tests
run: poetry run -- nox -s test:integration -- --coverage
env:
SAAS_HOST: ${{ secrets.INTEGRATION_TEAM_SAAS_STAGING_HOST }}
Expand Down
4 changes: 4 additions & 0 deletions doc/changes/unreleased.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Unreleased

## Summary

## Refactorings

* #160: Updated PTB to version 7.0.0
6 changes: 3 additions & 3 deletions doc/developer_guide/developer_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

saas-api-python includes a file `.pre-commit-config.yaml`.

The following command installs the pre-commit hooks, see also [framework pre-commmit](https://pre-commit.com/) and Git documentation on [Customizing Git Git Hooks](https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks):
The following command installs the pre-commit hooks, see also [framework pre-commit](https://pre-commit.com/) and Git documentation on [Customizing Git - Git Hooks](https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks):

```shell
poetry run -- pre-commit install
Expand Down Expand Up @@ -33,7 +33,7 @@ which regenerates the api, and checks it against the api version commited to Git
If this check fails, it is likely for one of the following causes:

* SaaS API could have changed in the meantime (should be detected automatically)
* SaaS production vs. live system potentially can have subtle differences in the json API description (for api generation the production system is used)
* SaaS production vs. live system potentially can have subtle differences in the JSON API description (for api generation the production system is used)
* The version of python used changed
* The version of the generator openapi-python-client changed

Expand Down Expand Up @@ -99,7 +99,7 @@ Executing the integration tests requires the following environment variables to

Some of the test cases verify connecting to a SaaS database instance and execution will take about 20 minutes.

The regular CI build will ask for a confirmation (aka. "review) before executing these tests.
The regular CI build will ask for a confirmation (aka. review) before executing these tests.

## Creating a Release

Expand Down
3 changes: 3 additions & 0 deletions exasol/saas/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from importlib.metadata import version

__version__ = version("exasol-saas-api")
15 changes: 0 additions & 15 deletions exasol/saas/version.py

This file was deleted.

2 changes: 1 addition & 1 deletion noxconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
project_name="saas",
python_versions=("3.10", "3.11", "3.12", "3.13"),
# Actually SAPIPY itests don't use any (on-prem) database version, see
# https://github.com/exasol/python-toolbox/issues/682.
# https://github.com/exasol/python-toolbox/issues/682
exasol_versions=("7.1.30",),
)
Loading
Loading