Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop Django 3.2, Add Django 5.0, use Ruff for linting and formatting #244

Merged
merged 20 commits into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Drop support for Django 3.2
Partly as a result of django-taggit 5.0 doing the same, and us
doing the same being simpler, and it coming out of LTS soon.
  • Loading branch information
philgyford committed Dec 12, 2023
commit 48078fa1e8fbad2b3a0f7d1561d675788a37a4c4
10 changes: 1 addition & 9 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,16 @@ jobs:
fail-fast: false
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13-dev"]
django-version: ["3.2", "4.1", "4.2", "5.0", "main"]
django-version: ["4.1", "4.2", "5.0", "main"]
exclude:
# Django 5.0 isn't compatible with python < 3.10
- python-version: "3.9"
django-version: "5.0"
- python-version: "3.9"
django-version: "main"

- python-version: "3.11"
django-version: "3.2"

- python-version: "3.12"
django-version: "3.2"
- python-version: "3.12"
django-version: "4.1"

- python-version: "3.13-dev"
django-version: "3.2"
- python-version: "3.13-dev"
django-version: "4.1"

Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Added support for Django 5.0

### Removed

- Dropped support for Django 3.2.

### Changed

- Allowed use of Pillow v10 and django-imagekit v5.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)

A collection of Django apps for copying things from third-party sites and services. Requires Python 3.9 to 3.12, and Django 3.2, 4.1, or 4.2.
A collection of Django apps for copying things from third-party sites and services. Requires Python 3.9 to 3.12, and Django 4.1, 4.2 or 5.0.

[Read the documentation.](http://django-ditto.readthedocs.io/en/latest/)

Expand Down
2 changes: 1 addition & 1 deletion docs/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Introduction

A collection of Django apps for copying things from third-party sites and services. If something doesn't make sense, `email Phil Gyford <mailto:phil@gyford.com>`_ and I'll try and clarify it.

Requires Python 3.9 to 3.12, and Django 3.2, 4.1, 4.2, and 5.0.
Requires Python 3.9 to 3.12, and Django 4.1, 4.2, and 5.0.

`See screenshots of a site using the supplied templates. <https://github.com/philgyford/django-ditto/tree/main/screenshots>`_

Expand Down
7 changes: 2 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,17 +90,15 @@ def get_author_email():
install_requires=[
"django-imagekit>=4.0,<6.0",
"django-sortedm2m>=3.0.0,<3.2",
# django-taggit 5.0 removes support for Django 3.2, so update this when we
# drop Django 3.2:
"django-taggit>=3.0.0,<5.0",
"django-taggit>=4.0.0,<6.0",
"flickrapi>=2.4,<2.5",
"pillow>=9.0.0,<11.0",
"twitter-text-python>=1.1.1,<1.2",
"twython>=3.7.0,<3.10",
],
dependency_links=[],
tests_require=tests_require,
extras_require={"dev": dev_require + ["Django>=4.1,<=5.0"], "test": tests_require},
extras_require={"dev": dev_require + ["Django>=4.2,<=5.0"], "test": tests_require},
include_package_data=True,
license=get_license(),
description=(
Expand All @@ -116,7 +114,6 @@ def get_author_email():
"Development Status :: 5 - Production/Stable",
"Environment :: Web Environment",
"Framework :: Django",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.1",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
Expand Down
6 changes: 2 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ minversion = 1.8

envlist =
ruff
py39-django{32,41,42}
py310-django{32,41,42,50,main}
py39-django{41,42}
py310-django{41,42,50,main}
py311-django{41,42,50,main}
py312-django{42,50,main}

Expand All @@ -20,7 +20,6 @@ python =
[gh-actions:env]
; Maps GitHub Actions DJANGO version env var to tox env vars:
DJANGO =
3.2: django32
4.1: django41
4.2: django42
4.0: django50
Expand All @@ -36,7 +35,6 @@ setenv =

[testenv]
deps =
django32: Django >= 3.2, < 3.3
django41: Django >= 4.1, < 4.2
django42: Django >= 4.2, < 4.3
django50: Django >= 5.0, < 5.1
Expand Down
Loading