From 2c733cf6e796be9e6edf59be9bfbb9aa2d204a5f Mon Sep 17 00:00:00 2001
From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sun, 31 Dec 2023 07:23:42 +0100
Subject: [PATCH] New upstream version 2.2
---
.github/workflows/tests.yml | 3 +++
.pre-commit-config.yaml | 17 +++++++++--------
CHANGELOG.rst | 12 ++++++++++--
js_asset/__init__.py | 2 +-
pyproject.toml | 4 ++++
tests/testapp/test_js_asset.py | 8 ++------
tox.ini | 4 +++-
7 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index cd0c5da..3e00b1d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -5,6 +5,8 @@ on:
branches: [main]
pull_request:
branches: [main]
+ schedule:
+ - cron: "37 1 1 * *"
jobs:
tests:
@@ -18,6 +20,7 @@ jobs:
- "3.9"
- "3.10"
- "3.11"
+ - "3.12"
steps:
- uses: actions/checkout@v3
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index fbaf213..a6da24c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
exclude: ".yarn/|yarn.lock|\\.min\\.(css|js)$"
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v4.4.0
+ rev: v4.5.0
hooks:
- id: check-added-large-files
- id: check-builtin-literals
@@ -14,29 +14,30 @@ repos:
- id: mixed-line-ending
- id: trailing-whitespace
- repo: https://github.com/adamchainz/django-upgrade
- rev: 1.13.0
+ rev: 1.15.0
hooks:
- id: django-upgrade
args: [--target-version, "3.2"]
- - repo: https://github.com/charliermarsh/ruff-pre-commit
- rev: "v0.0.272"
+ - repo: https://github.com/astral-sh/ruff-pre-commit
+ rev: "v0.1.7"
hooks:
- id: ruff
- repo: https://github.com/psf/black
- rev: 23.3.0
+ rev: 23.12.0
hooks:
- id: black
- repo: https://github.com/pre-commit/mirrors-prettier
- rev: v3.0.0-alpha.9-for-vscode
+ rev: v4.0.0-alpha.4
hooks:
- id: prettier
+ entry: env PRETTIER_LEGACY_CLI=1 prettier
args: [--list-different, --no-semi]
exclude: "^conf/|.*\\.html$"
- repo: https://github.com/tox-dev/pyproject-fmt
- rev: 0.11.2
+ rev: 1.5.3
hooks:
- id: pyproject-fmt
- repo: https://github.com/abravalheri/validate-pyproject
- rev: v0.13
+ rev: v0.15
hooks:
- id: validate-pyproject
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index baaf0db..150cff4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,8 +4,16 @@
Change log
==========
-`Next version`_
-~~~~~~~~~~~~~~~
+Next version
+~~~~~~~~~~~~
+
+
+2.2 (2023-12-12)
+~~~~~~~~~~~~~~~~
+
+- Started running the tests periodically to detect breakages early.
+- Added Django 5.0, Python 3.12.
+- Fixed building with hatchling 1.19. Thanks Michał Górny!
2.1 (2023-06-28)
diff --git a/js_asset/__init__.py b/js_asset/__init__.py
index 0adc3e0..6c06b22 100644
--- a/js_asset/__init__.py
+++ b/js_asset/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "2.1.0"
+__version__ = "2.2.0"
import contextlib
diff --git a/pyproject.toml b/pyproject.toml
index cf963d8..810c5ed 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -25,6 +25,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
+ "Programming Language :: Python :: 3.12",
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
"Topic :: Software Development",
"Topic :: Software Development :: Libraries :: Application Frameworks",
@@ -42,6 +43,9 @@ tests = [
[project.urls]
Homepage = "https://github.com/matthiask/django-js-asset/"
+[tool.hatch.build.targets.wheel]
+packages = ["js_asset"]
+
[tool.hatch.version]
path = "js_asset/__init__.py"
diff --git a/tests/testapp/test_js_asset.py b/tests/testapp/test_js_asset.py
index 465b34e..869665e 100644
--- a/tests/testapp/test_js_asset.py
+++ b/tests/testapp/test_js_asset.py
@@ -34,9 +34,7 @@ class AssetTest(TestCase):
html,
)
self.assertInHTML(
- '<script{} src="/static/app/asset.js" data-the-answer="42" id="asset-script"></script>'.format(
- JS_TYPE
- ),
+ f'<script{JS_TYPE} src="/static/app/asset.js" data-the-answer="42" id="asset-script"></script>',
html,
)
self.assertInHTML(
@@ -49,9 +47,7 @@ class AssetTest(TestCase):
html = "%s" % media
self.assertInHTML(
- '<script{} src="https://cdn.example.org/script.js"></script>'.format(
- JS_TYPE
- ),
+ f'<script{JS_TYPE} src="https://cdn.example.org/script.js"></script>',
html,
)
diff --git a/tox.ini b/tox.ini
index 3fd4055..7d40ad9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,8 @@
[tox]
envlist =
py{38,39,310}-dj{32,41,42}
- py{310,311}-dj{32,41,42,main}
+ py{310,311}-dj{32,41,42,50,main}
+ py{312}-dj{42,50,main}
[testenv]
usedevelop = true
@@ -13,4 +14,5 @@ deps =
dj32: Django>=3.2,<4.0
dj41: Django>=4.1,<4.2
dj42: Django>=4.2,<5.0
+ dj50: Django>=5.0,<5.1
djmain: https://github.com/django/django/archive/main.tar.gz
--
GitLab