From b00c964e869f3d76033b0290ce9f8d16e56ef0d8 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 20 Jun 2023 20:30:23 +0200 Subject: [PATCH 1/4] Add 'make poetry-update' --- Makefile | 9 ++++++++- package-lock.json | 8 ++++---- package.json | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 08d439f422a72..e8fcbdbc45dae 100644 --- a/Makefile +++ b/Makefile @@ -926,11 +926,18 @@ node_modules: package-lock.json .PHONY: npm-update npm-update: node-check | node_modules - npx updates -cu + npx updates -u -f package.json rm -rf node_modules package-lock.json npm install --package-lock @touch node_modules +.PHONY: poetry-update +poetry-update: node-check | node_modules + npx updates -u -f pyproject.toml + rm -rf .venv poetry.lock + poetry install + @touch .venv + .PHONY: fomantic fomantic: rm -rf $(FOMANTIC_WORK_DIR)/build diff --git a/package-lock.json b/package-lock.json index 43846cf4a0597..06c4f079e1782 100644 --- a/package-lock.json +++ b/package-lock.json @@ -77,7 +77,7 @@ "stylelint-declaration-strict-value": "1.9.2", "stylelint-stylistic": "0.4.2", "svgo": "3.0.2", - "updates": "14.2.4", + "updates": "14.2.6", "vitest": "0.32.2" }, "engines": { @@ -10363,9 +10363,9 @@ } }, "node_modules/updates": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/updates/-/updates-14.2.4.tgz", - "integrity": "sha512-r54h4Q12lUAmQ9dENy7BnY22AnTfW4YGEZw73gv6RvNEWgcZ3qS88jPLc1ckPAzt/8TPKWwLkSVpbEpgGwglJw==", + "version": "14.2.6", + "resolved": "https://registry.npmjs.org/updates/-/updates-14.2.6.tgz", + "integrity": "sha512-ljmRpeYCSntQmoKOSyLyFyj5GaL7L6WIPBfYVty0lRkPzxHi70bMIeKTKSc+PIn2Fbh6v06aCJBfmwaPA9OKeg==", "dev": true, "bin": { "updates": "bin/updates.js" diff --git a/package.json b/package.json index dd2eff71956c4..18381d2a2f79e 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "stylelint-declaration-strict-value": "1.9.2", "stylelint-stylistic": "0.4.2", "svgo": "3.0.2", - "updates": "14.2.4", + "updates": "14.2.6", "vitest": "0.32.2" }, "browserslist": [ From b1ab82fb350bce6ed76206879bc672361f5d65aa Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 22 Jun 2023 14:55:37 +0200 Subject: [PATCH 2/4] update updates --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 06c4f079e1782..c21eef79da129 100644 --- a/package-lock.json +++ b/package-lock.json @@ -77,7 +77,7 @@ "stylelint-declaration-strict-value": "1.9.2", "stylelint-stylistic": "0.4.2", "svgo": "3.0.2", - "updates": "14.2.6", + "updates": "14.2.7", "vitest": "0.32.2" }, "engines": { @@ -10363,9 +10363,9 @@ } }, "node_modules/updates": { - "version": "14.2.6", - "resolved": "https://registry.npmjs.org/updates/-/updates-14.2.6.tgz", - "integrity": "sha512-ljmRpeYCSntQmoKOSyLyFyj5GaL7L6WIPBfYVty0lRkPzxHi70bMIeKTKSc+PIn2Fbh6v06aCJBfmwaPA9OKeg==", + "version": "14.2.7", + "resolved": "https://registry.npmjs.org/updates/-/updates-14.2.7.tgz", + "integrity": "sha512-2g3k/lxr3SN0PTXBHJc72I816RK82sdgiNbhhCrQb7gK3SpwiumHeaGmJNrtSJ8VKjiWwtCFOsUKWbAXQBarpA==", "dev": true, "bin": { "updates": "bin/updates.js" diff --git a/package.json b/package.json index 18381d2a2f79e..ad4a98a6e3e87 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "stylelint-declaration-strict-value": "1.9.2", "stylelint-stylistic": "0.4.2", "svgo": "3.0.2", - "updates": "14.2.6", + "updates": "14.2.7", "vitest": "0.32.2" }, "browserslist": [ From 0575c7daeae486f42de73b0effd31f60d171e523 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 26 Jun 2023 21:29:25 +0200 Subject: [PATCH 3/4] update --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index c21eef79da129..5078c9bc021fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -77,7 +77,7 @@ "stylelint-declaration-strict-value": "1.9.2", "stylelint-stylistic": "0.4.2", "svgo": "3.0.2", - "updates": "14.2.7", + "updates": "14.2.8", "vitest": "0.32.2" }, "engines": { @@ -10363,9 +10363,9 @@ } }, "node_modules/updates": { - "version": "14.2.7", - "resolved": "https://registry.npmjs.org/updates/-/updates-14.2.7.tgz", - "integrity": "sha512-2g3k/lxr3SN0PTXBHJc72I816RK82sdgiNbhhCrQb7gK3SpwiumHeaGmJNrtSJ8VKjiWwtCFOsUKWbAXQBarpA==", + "version": "14.2.8", + "resolved": "https://registry.npmjs.org/updates/-/updates-14.2.8.tgz", + "integrity": "sha512-Ca+M1vKKBBRiQSi3yrN8OdncmP9osIf1oJM/HpEIHeDvyGLs/noTi9X2LS4zl50VXRTSCqssF5CZN0XWzSPigg==", "dev": true, "bin": { "updates": "bin/updates.js" diff --git a/package.json b/package.json index ad4a98a6e3e87..37bc759ef259d 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "stylelint-declaration-strict-value": "1.9.2", "stylelint-stylistic": "0.4.2", "svgo": "3.0.2", - "updates": "14.2.7", + "updates": "14.2.8", "vitest": "0.32.2" }, "browserslist": [ From 1d6cf5932bce52ecc30f9ee7ae16628a241e6766 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 26 Jun 2023 21:31:30 +0200 Subject: [PATCH 4/4] upgrade djlint --- poetry.lock | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index 69258f749c99f..7d106e15519ea 100644 --- a/poetry.lock +++ b/poetry.lock @@ -42,13 +42,13 @@ six = ">=1.13.0" [[package]] name = "djlint" -version = "1.31.0" +version = "1.31.1" description = "HTML Template Linter and Formatter" optional = false python-versions = ">=3.8.0,<4.0.0" files = [ - {file = "djlint-1.31.0-py3-none-any.whl", hash = "sha256:2b9200c67103b79835b7547ff732e910888d1f0ef684f5b329eb64b14d09c046"}, - {file = "djlint-1.31.0.tar.gz", hash = "sha256:8acb4b751b429c5aabb1aef5b6007bdf53224eceda25c5fbe04c42cc57c0a7ba"}, + {file = "djlint-1.31.1-py3-none-any.whl", hash = "sha256:9b2e2fc3a059a8e5a62f309edea15c1aeee331a279ab2699b9fb51a31d8c0934"}, + {file = "djlint-1.31.1.tar.gz", hash = "sha256:a11739e2f919f760b3986eb13d06e00171f3bd342b8d88e9bd914a4260eaa8ce"}, ] [package.dependencies] @@ -328,4 +328,4 @@ telegram = ["requests"] [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "22c4af11eadd8784b613951d6160d67be0f33500238a450741c3d75beb218dad" +content-hash = "f03ad8e7c4f6e797ac3c04630db8cc16438cd59642653c26fd401633cd62d696" diff --git a/pyproject.toml b/pyproject.toml index ce5f475b272fa..7a30f5914066e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ authors = [] python = "^3.8" [tool.poetry.group.dev.dependencies] -djlint = "1.31.0" +djlint = "1.31.1" [tool.djlint] profile="golang"