From c63f75c6b2e11651dc36212bfa476d352e18d0ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 14:28:39 +0000 Subject: [PATCH 01/10] Chore(deps-dev): Update mypy requirement from <1.15 to <1.16 Updates the requirements on [mypy](https://github.com/python/mypy) to permit the latest version. - [Changelog](https://github.com/python/mypy/blob/master/CHANGELOG.md) - [Commits](https://github.com/python/mypy/compare/v0.1.0...v1.15.0) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 15591f88..12737e3d 100644 --- a/setup.py +++ b/setup.py @@ -67,7 +67,7 @@ def read(path): 'backports.zoneinfo<1; python_version<"3.9"', "certifi", "createcoverage>=1,<2", - "mypy<1.15", + "mypy<1.16", "poethepoet<0.33", "ruff<0.10", "stopit>=1.1.2,<2", From 81a50449ff3d7396684ba504f3e20935c7896c3d Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Tue, 18 Feb 2025 23:28:52 +0100 Subject: [PATCH 02/10] CI: Improve setup of and caching with uv --- .github/workflows/codeql.yml | 13 +++++++------ .github/workflows/nightly.yml | 11 +++++++---- .github/workflows/release.yml | 17 ++++++++++++----- .github/workflows/tests.yml | 11 +++++++---- 4 files changed, 33 insertions(+), 19 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 6d0f4436..29c9ae92 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -30,6 +30,7 @@ jobs: fail-fast: false matrix: language: [ python ] + python-version: ['3.11'] steps: - name: Checkout @@ -38,15 +39,15 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.11 - architecture: x64 - cache: 'pip' - cache-dependency-path: | - setup.py + python-version: ${{ matrix.python-version }} - - name: Install uv + - name: Set up uv uses: astral-sh/setup-uv@v5 with: + cache-dependency-glob: | + setup.py + cache-suffix: ${{ matrix.python-version }} + enable-cache: true version: "latest" - name: Initialize CodeQL diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index cd5fa37f..964de178 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -25,16 +25,19 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} + + - name: Set up Python uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - cache: 'pip' - cache-dependency-path: 'setup.py' - - name: Install uv + - name: Set up uv uses: astral-sh/setup-uv@v5 with: + cache-dependency-glob: | + setup.py + cache-suffix: ${{ matrix.python-version }} + enable-cache: true version: "latest" - name: Invoke tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eca585dc..b1f221b8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,12 @@ on: push jobs: pypi: name: Build & publish package to pypi - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: ['ubuntu-latest'] + python-version: ['3.11'] if: startsWith(github.event.ref, 'refs/tags') steps: - uses: actions/checkout@v4 @@ -14,13 +19,15 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.11' - cache: 'pip' - cache-dependency-path: 'setup.py' + python-version: ${{ matrix.python-version }} - - name: Install uv + - name: Set up uv uses: astral-sh/setup-uv@v5 with: + cache-dependency-glob: | + setup.py + cache-suffix: ${{ matrix.python-version }} + enable-cache: true version: "latest" - name: Build package diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 16ed304a..fe34eff0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -40,16 +40,19 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} + + - name: Set up Python uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - cache: 'pip' - cache-dependency-path: setup.py - - name: Install uv + - name: Set up uv uses: astral-sh/setup-uv@v5 with: + cache-dependency-glob: | + setup.py + cache-suffix: ${{ matrix.python-version }} + enable-cache: true version: "latest" - name: Invoke tests From 2d325376d370e08f80f2749f4bc784f41cbdef69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Feb 2025 22:47:39 +0000 Subject: [PATCH 03/10] Chore(deps-dev): Update zope-testrunner requirement Updates the requirements on [zope-testrunner](https://github.com/zopefoundation/zope.testrunner) to permit the latest version. - [Changelog](https://github.com/zopefoundation/zope.testrunner/blob/master/CHANGES.rst) - [Commits](https://github.com/zopefoundation/zope.testrunner/compare/5.0...7.0) --- updated-dependencies: - dependency-name: zope-testrunner dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 12737e3d..5a7445c8 100644 --- a/setup.py +++ b/setup.py @@ -74,7 +74,7 @@ def read(path): "pytz", "zc.customdoctests>=1.0.1,<2", "zope.testing>=4,<6", - "zope.testrunner>=5,<7", + "zope.testrunner>=5,<8", ], }, python_requires=">=3.6", From 819b63e512574abb707a8f10716298381bcd9fef Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Thu, 6 Mar 2025 23:08:05 +0100 Subject: [PATCH 04/10] Chore: Relax dependency on poethepoet --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5a7445c8..408d283a 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ def read(path): "certifi", "createcoverage>=1,<2", "mypy<1.16", - "poethepoet<0.33", + "poethepoet<1", "ruff<0.10", "stopit>=1.1.2,<2", "pytz", From 3f133eb8a3bee5b4697ba5bbd708e88bc68a4567 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Mar 2025 14:54:09 +0000 Subject: [PATCH 05/10] Chore(deps-dev): Update ruff requirement from <0.10 to <0.12 Updates the requirements on [ruff](https://github.com/astral-sh/ruff) to permit the latest version. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/v0.0.18...0.11.0) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 408d283a..386b3c35 100644 --- a/setup.py +++ b/setup.py @@ -69,7 +69,7 @@ def read(path): "createcoverage>=1,<2", "mypy<1.16", "poethepoet<1", - "ruff<0.10", + "ruff<0.12", "stopit>=1.1.2,<2", "pytz", "zc.customdoctests>=1.0.1,<2", From 5ab391c2cae8d006858c0cde8964106c7d885e06 Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Fri, 28 Mar 2025 16:16:33 +0100 Subject: [PATCH 06/10] Documentation: Remove page about SQLAlchemy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The location redirects to [1] anyway. [1] https://cratedb.com/docs/sqlalchemy-cratedb/ --- docs/connect.rst | 2 +- docs/index-all.rst | 1 - docs/index.rst | 2 +- docs/query.rst | 2 +- docs/sqlalchemy.rst | 17 ----------------- 5 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 docs/sqlalchemy.rst diff --git a/docs/connect.rst b/docs/connect.rst index 944fe263..774f6746 100644 --- a/docs/connect.rst +++ b/docs/connect.rst @@ -10,7 +10,7 @@ Connect to CrateDB `Python Database API Specification v2.0`_ (PEP 249). For help using the `SQLAlchemy`_ dialect, consult the - :ref:`SQLAlchemy dialect documentation `. + :ref:`SQLAlchemy dialect documentation `. .. SEEALSO:: diff --git a/docs/index-all.rst b/docs/index-all.rst index 85a508e9..5d9244d5 100644 --- a/docs/index-all.rst +++ b/docs/index-all.rst @@ -16,7 +16,6 @@ CrateDB Python Client -- all pages connect query blobs - sqlalchemy data-types by-example/index other-options diff --git a/docs/index.rst b/docs/index.rst index 67415c94..353f8c69 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -99,7 +99,7 @@ please consult the :ref:`data-types` documentation page. Migration Notes =============== -The :ref:`CrateDB dialect ` for `SQLAlchemy`_ is provided +The :ref:`CrateDB dialect ` for `SQLAlchemy`_ is provided by the `sqlalchemy-cratedb`_ package. If you are migrating from previous versions of ``crate[sqlalchemy]<1.0.0``, you diff --git a/docs/query.rst b/docs/query.rst index 00da8170..eb948fc0 100644 --- a/docs/query.rst +++ b/docs/query.rst @@ -10,7 +10,7 @@ Query CrateDB `Python Database API Specification v2.0`_ (PEP 249). For help using the `SQLAlchemy`_ dialect, consult - :ref:`the SQLAlchemy dialect documentation `. + :ref:`the SQLAlchemy dialect documentation `. .. SEEALSO:: diff --git a/docs/sqlalchemy.rst b/docs/sqlalchemy.rst deleted file mode 100644 index caf5ca8d..00000000 --- a/docs/sqlalchemy.rst +++ /dev/null @@ -1,17 +0,0 @@ -.. _sqlalchemy-support: -.. _using-sqlalchemy: - -================== -SQLAlchemy support -================== - -`SQLAlchemy`_ is the most popular `Object-Relational Mapping`_ (ORM) library -for Python. - -The `SQLAlchemy`_ CrateDB dialect is provided by the `sqlalchemy-cratedb`_ -package. - - -.. _Object-Relational Mapping: https://en.wikipedia.org/wiki/Object-relational_mapping -.. _SQLAlchemy: https://www.sqlalchemy.org/ -.. _sqlalchemy-cratedb: https://github.com/crate-workbench/sqlalchemy-cratedb From 4e678baafbedda1e1ccbbcd4d1eb00c4d2c27537 Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Wed, 7 May 2025 00:10:22 +0200 Subject: [PATCH 07/10] Chore: Fix build wrt. `setuptools` --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index f8de725a..cf2e5195 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ +setuptools<80.3 zc.buildout==3.3 zope.interface==6.4.post2 From d32b74a55a5fa9b7b02f039791bca668defaf0ad Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Wed, 7 May 2025 00:17:16 +0200 Subject: [PATCH 08/10] Chore: Fix build wrt. `urllib3` --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index cf2e5195..8935d351 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ setuptools<80.3 +urllib3<2.4 zc.buildout==3.3 zope.interface==6.4.post2 From fb045ec0b27c267ffd231bfc5810539bd4f7bd45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 May 2025 22:26:32 +0000 Subject: [PATCH 09/10] Chore(deps): Bump astral-sh/setup-uv from 5 to 6 Bumps [astral-sh/setup-uv](https://github.com/astral-sh/setup-uv) from 5 to 6. - [Release notes](https://github.com/astral-sh/setup-uv/releases) - [Commits](https://github.com/astral-sh/setup-uv/compare/v5...v6) --- updated-dependencies: - dependency-name: astral-sh/setup-uv dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/tests.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 29c9ae92..6b2d939d 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -42,7 +42,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Set up uv - uses: astral-sh/setup-uv@v5 + uses: astral-sh/setup-uv@v6 with: cache-dependency-glob: | setup.py diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 964de178..95025896 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -32,7 +32,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Set up uv - uses: astral-sh/setup-uv@v5 + uses: astral-sh/setup-uv@v6 with: cache-dependency-glob: | setup.py diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b1f221b8..eb561b91 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Set up uv - uses: astral-sh/setup-uv@v5 + uses: astral-sh/setup-uv@v6 with: cache-dependency-glob: | setup.py diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fe34eff0..47cd7414 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -47,7 +47,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Set up uv - uses: astral-sh/setup-uv@v5 + uses: astral-sh/setup-uv@v6 with: cache-dependency-glob: | setup.py From 5a9f5184a4085fd6948191f6ae3ce0d3af476736 Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Fri, 9 May 2025 13:50:32 +0200 Subject: [PATCH 10/10] CI: Use Python 3.13 for CodeQL analysis --- .github/workflows/codeql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 6b2d939d..f57f0277 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -30,7 +30,7 @@ jobs: fail-fast: false matrix: language: [ python ] - python-version: ['3.11'] + python-version: ['3.13'] steps: - name: Checkout