diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 6d0f4436..f57f0277 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.13'] 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 - uses: astral-sh/setup-uv@v5 + - name: Set up uv + uses: astral-sh/setup-uv@v6 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..95025896 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 - uses: astral-sh/setup-uv@v5 + - name: Set up uv + uses: astral-sh/setup-uv@v6 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..eb561b91 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 - uses: astral-sh/setup-uv@v5 + - name: Set up uv + uses: astral-sh/setup-uv@v6 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..47cd7414 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 - uses: astral-sh/setup-uv@v5 + - name: Set up uv + uses: astral-sh/setup-uv@v6 with: + cache-dependency-glob: | + setup.py + cache-suffix: ${{ matrix.python-version }} + enable-cache: true version: "latest" - name: Invoke tests 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 diff --git a/requirements.txt b/requirements.txt index f8de725a..8935d351 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,4 @@ +setuptools<80.3 +urllib3<2.4 zc.buildout==3.3 zope.interface==6.4.post2 diff --git a/setup.py b/setup.py index 15591f88..386b3c35 100644 --- a/setup.py +++ b/setup.py @@ -67,14 +67,14 @@ def read(path): 'backports.zoneinfo<1; python_version<"3.9"', "certifi", "createcoverage>=1,<2", - "mypy<1.15", - "poethepoet<0.33", - "ruff<0.10", + "mypy<1.16", + "poethepoet<1", + "ruff<0.12", "stopit>=1.1.2,<2", "pytz", "zc.customdoctests>=1.0.1,<2", "zope.testing>=4,<6", - "zope.testrunner>=5,<7", + "zope.testrunner>=5,<8", ], }, python_requires=">=3.6",