Skip to content

Commit

Permalink
update for Django 5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
timgraham committed Oct 14, 2024
1 parent 3dbfca9 commit fb35849
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 13 deletions.
8 changes: 2 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
# Changelog

## 5.1.1 - Unreleased
## 5.2 - Unreleased

- Confirmed support for CockroachDB 24.2.x (no code changes required).

## 5.1 - 2024-08-13

Initial release for Django 5.1.x and CockroachDB 23.1.x, 23.2.x, and 24.1.x.
Initial release for Django 5.2.x and CockroachDB 23.2.x, 24.1.x, and 24.2.x.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ production it is advised to use the package built from sources.
## Install and usage

Use the version of django-cockroachdb that corresponds to your version of
Django. For example, to get the latest compatible release for Django 5.1.x:
Django. For example, to get the latest compatible release for Django 5.2.x:

`pip install django-cockroachdb==5.1.*`
`pip install django-cockroachdb==5.2.*`

The minor release number of Django doesn't correspond to the minor release
number of django-cockroachdb. Use the latest minor release of each.
Expand Down
2 changes: 1 addition & 1 deletion django-test-suite/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ VERSION=$1

# clone django into the repo.
rm -rf _django_repo
git clone --depth 1 --single-branch --branch cockroach-5.1.x https://github.com/timgraham/django _django_repo
git clone --depth 1 --single-branch --branch cockroach-5.2.x https://github.com/timgraham/django _django_repo

# install the django requirements.
cd _django_repo/tests/
Expand Down
2 changes: 1 addition & 1 deletion django_cockroachdb/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '5.1'
__version__ = '5.2a0'

# Check Django compatibility before other imports which may fail if the
# wrong version of Django is installed.
Expand Down
2 changes: 1 addition & 1 deletion django_cockroachdb/features.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def django_test_expected_failures(self):
# concat(): unknown signature: concat(string, int2) (desired <string>)
'db_functions.text.test_concat.ConcatTests.test_concat_non_str',
# unknown signature: concat(varchar, int) (returning <string>)
'migrations.test_operations.OperationTests.test_add_generate_field',
'migrations.test_operations.OperationTests.test_add_generated_field',
})
if self.is_cockroachdb_24_1:
# USING cast required: https://github.com/cockroachdb/cockroach/issues/82416#issuecomment-2029803229
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ long_description_content_type = text/markdown
classifiers =
Development Status :: 5 - Production/Stable
Framework :: Django
Framework :: Django :: 5.1
Framework :: Django :: 5.2
License :: OSI Approved :: Apache Software License
Operating System :: OS Independent
Programming Language :: Python
Expand All @@ -27,7 +27,7 @@ project_urls =
python_requires = >=3.10
packages = find:
install_requires =
django >= 5.1, < 5.2
# django >= 5.2, < 6.0

[flake8]
max-line-length = 119
Expand Down

0 comments on commit fb35849

Please sign in to comment.