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
10 changes: 5 additions & 5 deletions .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
- name: Check out the repository
uses: actions/checkout@v4

- name: Set up Python 3.10
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"

- name: Install and run tox
run: |
Expand All @@ -38,15 +38,15 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.10', '3.11', '3.12']
django-version: ['32', '40', '41', '42', '50']
python-version: ['3.10', '3.11', '3.12', '3.13']
django-version: ['42', '50', '51', '52']

env:
TOXENV: py${{ matrix.python-version }}-django${{ matrix.django-version }}

services:
cassandra:
image: scylladb/scylla:5.4
image: scylladb/scylla:6.2
ports:
- 9042:9042
steps:
Expand Down
5 changes: 5 additions & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Django Cassandra Engine - CHANGELOG

## Version 1.10.0 (11.06.2025)

* Support Django up to 5.2
* Remove support for Django<4.2
* Add support for Python 3.13

## Version 1.9.0 (17.03.2024)

Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repo_url: https://github.com/r4fek/django-cassandra-engine

# Options
extra:
version: 1.9.0
version: 1.10.0
logo: images/dj_cassandra.png
author:
github: r4fek
Expand Down
233 changes: 129 additions & 104 deletions poetry.lock

Large diffs are not rendered by default.

13 changes: 6 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "django-cassandra-engine"
version = "1.9.0"
version = "1.10.0"
description = "Django Cassandra Engine"
authors = ["Rafał Furmański <[email protected]>"]
license = "2-clause BSD"
Expand All @@ -18,11 +18,10 @@ classifiers = [
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: 3.13',
'Topic :: Database',
'Topic :: Internet',
'Topic :: Software Development :: Libraries :: Python Modules',
Expand All @@ -33,11 +32,11 @@ packages = [{ include = "django_cassandra_engine" }]
Changelog = "https://r4fek.github.io/django-cassandra-engine/changelog/"

[tool.poetry.dependencies]
python = "^3.8 || ^3.9 || ^3.10 || ^3.11 || ^3.12"
django = "^3.2 || ^4.0 || ^4.1 || ^4.2 || ^5.0"
scylla-driver = "^3.26.0"
python = "^3.10 || ^3.11 || ^3.12 || ^3.13"
django = "^4.2 || ^5.0 || ^5.1 || ^5.2"
scylla-driver = "^3.29"

[tool.poetry.dev-dependencies]
[tool.poetry.group.dev.dependencies]
black = {version = "*", allow-prereleases = true}
coverage = "*"
djangorestframework = "*"
Expand Down
4 changes: 2 additions & 2 deletions test.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

docker-compose up -d
docker-compose run web wait-for-it cassandra:9042 -- poetry run tox
docker compose up -d
docker compose run web wait-for-it cassandra:9042 -- poetry run tox
7 changes: 3 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
isolated_build = True
envlist = fmt, lint, py{3.10,3.11,3.12}-django{32,40,41,42,50}
envlist = fmt, lint, py{3.10,3.11,3.12,3.13}-django{42,50,51,52}

[tox:.package]
# note tox will use the same python version as under what tox is installed to package
Expand All @@ -13,11 +13,10 @@ passenv = CASS_HOST
commands = poetry run {toxinidir}/testproject/runtests.py
deps =
coverage
django32: Django>=3.2,<3.3
django40: Django>=4.0,<4.1
django41: Django>=4.1,<4.2
django42: Django>=4.2,<5.0
django50: Django>=5.0,<5.1
django51: Django>=5.1,<5.2
django52: Django>=5.2,<5.3
djangomaster: https://github.com/django/django/archive/main.tar.gz
djangorestframework
freezegun==0.3.6
Expand Down
Loading