From 338a9d26859b1bd6ea7252bc3b119a1604ce1e72 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 09:40:21 -0500 Subject: [PATCH 1/9] Update dependency syncpack to v13 (#2030) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 226 +++++++++++++++++++++++++++++++-------------------- 2 files changed, 140 insertions(+), 88 deletions(-) diff --git a/package.json b/package.json index e22ffbc23a..63be8da070 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ }, "packageManager": "yarn@4.6.0", "devDependencies": { - "syncpack": "^12.4.0" + "syncpack": "^13.0.0" }, "resolutions": { "@types/react": "^18", diff --git a/yarn.lock b/yarn.lock index cb5715cb65..0000b16eb4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1657,14 +1657,14 @@ __metadata: languageName: node linkType: hard -"@effect/schema@npm:0.69.0": - version: 0.69.0 - resolution: "@effect/schema@npm:0.69.0" +"@effect/schema@npm:0.75.5": + version: 0.75.5 + resolution: "@effect/schema@npm:0.75.5" dependencies: - fast-check: "npm:^3.20.0" + fast-check: "npm:^3.21.0" peerDependencies: - effect: ^3.5.7 - checksum: 10/8b19643fb9d2654c75802cbdc000d9f69cd161a39b6c9e5aaf42eed976894a5e332d78816d9d3b0e211d714e9fd250ebe2d0a5cc6985f63ee0d9325658859fb3 + effect: ^3.9.2 + checksum: 10/597f33a7b678d43f461c03a432c23a02e823aaa6ca49fad1feec2215c7e5898bff6e238c044d6788d645a2c6b4b803aac4f32731f1b0dc1b649949162360d884 languageName: node linkType: hard @@ -7355,10 +7355,10 @@ __metadata: languageName: node linkType: hard -"chalk@npm:5.3.0, chalk@npm:^5.2.0, chalk@npm:^5.3.0": - version: 5.3.0 - resolution: "chalk@npm:5.3.0" - checksum: 10/6373caaab21bd64c405bfc4bd9672b145647fc9482657b5ea1d549b3b2765054e9d3d928870cdf764fb4aad67555f5061538ff247b8310f110c5c888d92397ea +"chalk@npm:5.4.1": + version: 5.4.1 + resolution: "chalk@npm:5.4.1" + checksum: 10/29df3ffcdf25656fed6e95962e2ef86d14dfe03cd50e7074b06bad9ffbbf6089adbb40f75c00744d843685c8d008adaf3aed31476780312553caf07fa86e5bc7 languageName: node linkType: hard @@ -7383,6 +7383,13 @@ __metadata: languageName: node linkType: hard +"chalk@npm:^5.2.0, chalk@npm:^5.3.0": + version: 5.3.0 + resolution: "chalk@npm:5.3.0" + checksum: 10/6373caaab21bd64c405bfc4bd9672b145647fc9482657b5ea1d549b3b2765054e9d3d928870cdf764fb4aad67555f5061538ff247b8310f110c5c888d92397ea + languageName: node + linkType: hard + "char-regex@npm:^1.0.2": version: 1.0.2 resolution: "char-regex@npm:1.0.2" @@ -7559,12 +7566,12 @@ __metadata: languageName: node linkType: hard -"cli-cursor@npm:^4.0.0": - version: 4.0.0 - resolution: "cli-cursor@npm:4.0.0" +"cli-cursor@npm:^5.0.0": + version: 5.0.0 + resolution: "cli-cursor@npm:5.0.0" dependencies: - restore-cursor: "npm:^4.0.0" - checksum: 10/ab3f3ea2076e2176a1da29f9d64f72ec3efad51c0960898b56c8a17671365c26e67b735920530eaf7328d61f8bd41c27f46b9cf6e4e10fe2fa44b5e8c0e392cc + restore-cursor: "npm:^5.0.0" + checksum: 10/1eb9a3f878b31addfe8d82c6d915ec2330cec8447ab1f117f4aa34f0137fbb3137ec3466e1c9a65bcb7557f6e486d343f2da57f253a2f668d691372dfa15c090 languageName: node linkType: hard @@ -7696,10 +7703,10 @@ __metadata: languageName: node linkType: hard -"commander@npm:12.1.0": - version: 12.1.0 - resolution: "commander@npm:12.1.0" - checksum: 10/cdaeb672d979816853a4eed7f1310a9319e8b976172485c2a6b437ed0db0a389a44cfb222bfbde772781efa9f215bdd1b936f80d6b249485b465c6cb906e1f93 +"commander@npm:13.1.0": + version: 13.1.0 + resolution: "commander@npm:13.1.0" + checksum: 10/d3b4b79e6be8471ddadacbb8cd441fe82154d7da7393b50e76165a9e29ccdb74fa911a186437b9a211d0fc071db6051915c94fb8ef16d77511d898e9dbabc6af languageName: node linkType: hard @@ -8573,10 +8580,12 @@ __metadata: languageName: node linkType: hard -"effect@npm:3.5.7": - version: 3.5.7 - resolution: "effect@npm:3.5.7" - checksum: 10/b4e6cdde83fe492258aba0d88d521d199cc6c144ce821b893d7ba890618a36b162616c442607d8494ad65096dff9a1f6183a66bc6d0e2f79b1e31d4a96946cf3 +"effect@npm:3.12.7": + version: 3.12.7 + resolution: "effect@npm:3.12.7" + dependencies: + fast-check: "npm:^3.23.1" + checksum: 10/167ae91b739f74e3e0d534163d39d6fca0be5bd7f8efe58340001bd2404cc824e607e79a361b2f416bfce425cd97ce77a0c0be8be4eeb22e48358d306c823523 languageName: node linkType: hard @@ -9699,21 +9708,12 @@ __metadata: languageName: node linkType: hard -"fast-check@npm:3.20.0": - version: 3.20.0 - resolution: "fast-check@npm:3.20.0" +"fast-check@npm:3.23.2, fast-check@npm:^3.21.0, fast-check@npm:^3.23.1": + version: 3.23.2 + resolution: "fast-check@npm:3.23.2" dependencies: pure-rand: "npm:^6.1.0" - checksum: 10/36395b688842509a42c06b72ca1cb3eeb813d44c6085b9b9c19f5bb3f7c36d241f28c8a5f491242590e162087908f97adbbc6fdf884b80e4ddb9ec489e51706f - languageName: node - linkType: hard - -"fast-check@npm:^3.20.0": - version: 3.22.0 - resolution: "fast-check@npm:3.22.0" - dependencies: - pure-rand: "npm:^6.1.0" - checksum: 10/26ae7cc228fcd9759124db10cbbc01efff730bcdc848544ec7c3a533b9d88dec88d2a4a79da0ea4eb1ec78611dc6576f06f3fa5f8ff7126ad2eecf5ce3da57c6 + checksum: 10/dab344146b778e8bc2973366ea55528d1b58d3e3037270262b877c54241e800c4d744957722c24705c787020d702aece11e57c9e3dbd5ea19c3e10926bf1f3fe languageName: node linkType: hard @@ -10662,6 +10662,15 @@ __metadata: languageName: node linkType: hard +"hosted-git-info@npm:^8.0.0": + version: 8.0.2 + resolution: "hosted-git-info@npm:8.0.2" + dependencies: + lru-cache: "npm:^10.0.1" + checksum: 10/dae9b04bf01efdb353d7b167fd257b95a48bb1a233a47b57c277b5ec8326dafc3c06a3999b92d1662fc3176cc2d6ea77db00b9f16195161c6c74f2e88e393721 + languageName: node + linkType: hard + "html-encoding-sniffer@npm:^3.0.0": version: 3.0.0 resolution: "html-encoding-sniffer@npm:3.0.0" @@ -12343,7 +12352,7 @@ __metadata: languageName: node linkType: hard -"jsonc-parser@npm:^3.2.0": +"jsonc-parser@npm:3.3.1, jsonc-parser@npm:^3.2.0": version: 3.3.1 resolution: "jsonc-parser@npm:3.3.1" checksum: 10/9b0dc391f20b47378f843ef1e877e73ec652a5bdc3c5fa1f36af0f119a55091d147a86c1ee86a232296f55c929bba174538c2bf0312610e0817a22de131cc3f4 @@ -13672,6 +13681,13 @@ __metadata: languageName: node linkType: hard +"mimic-function@npm:^5.0.0": + version: 5.0.1 + resolution: "mimic-function@npm:5.0.1" + checksum: 10/eb5893c99e902ccebbc267c6c6b83092966af84682957f79313311edb95e8bb5f39fb048d77132b700474d1c86d90ccc211e99bae0935447a4834eb4c882982c + languageName: node + linkType: hard + "min-indent@npm:^1.0.0, min-indent@npm:^1.0.1": version: 1.0.1 resolution: "min-indent@npm:1.0.1" @@ -13693,12 +13709,12 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:10.0.1": - version: 10.0.1 - resolution: "minimatch@npm:10.0.1" +"minimatch@npm:9.0.5, minimatch@npm:^9.0.0, minimatch@npm:^9.0.1, minimatch@npm:^9.0.4": + version: 9.0.5 + resolution: "minimatch@npm:9.0.5" dependencies: brace-expansion: "npm:^2.0.1" - checksum: 10/082e7ccbc090d5f8c4e4e029255d5a1d1e3af37bda837da2b8b0085b1503a1210c91ac90d9ebfe741d8a5f286ece820a1abb4f61dc1f82ce602a055d461d93f3 + checksum: 10/dd6a8927b063aca6d910b119e1f2df6d2ce7d36eab91de83167dd136bb85e1ebff97b0d3de1cb08bd1f7e018ca170b4962479fefab5b2a69e2ae12cb2edc8348 languageName: node linkType: hard @@ -13729,15 +13745,6 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^9.0.0, minimatch@npm:^9.0.1, minimatch@npm:^9.0.4": - version: 9.0.5 - resolution: "minimatch@npm:9.0.5" - dependencies: - brace-expansion: "npm:^2.0.1" - checksum: 10/dd6a8927b063aca6d910b119e1f2df6d2ce7d36eab91de83167dd136bb85e1ebff97b0d3de1cb08bd1f7e018ca170b4962479fefab5b2a69e2ae12cb2edc8348 - languageName: node - linkType: hard - "minimist@npm:^1.2.0, minimist@npm:^1.2.6": version: 1.2.8 resolution: "minimist@npm:1.2.8" @@ -13842,7 +13849,7 @@ __metadata: dependencies: "@nlux/react": "npm:^2.17.1" "@nlux/themes": "npm:^2.17.1" - syncpack: "npm:^12.4.0" + syncpack: "npm:^13.0.0" languageName: unknown linkType: soft @@ -14161,7 +14168,19 @@ __metadata: languageName: node linkType: hard -"npm-package-arg@npm:11.0.3, npm-package-arg@npm:^11.0.0": +"npm-package-arg@npm:12.0.1": + version: 12.0.1 + resolution: "npm-package-arg@npm:12.0.1" + dependencies: + hosted-git-info: "npm:^8.0.0" + proc-log: "npm:^5.0.0" + semver: "npm:^7.3.5" + validate-npm-package-name: "npm:^6.0.0" + checksum: 10/63ef48708653aa1a5e4353116cbbe78be3630dcd92a12a559cf9c9a8b71bbaf5016b8c99ab020730587772cc1892fa924bb2ac3baef1c740847b130c56ef531d + languageName: node + linkType: hard + +"npm-package-arg@npm:^11.0.0": version: 11.0.3 resolution: "npm-package-arg@npm:11.0.3" dependencies: @@ -14443,7 +14462,7 @@ __metadata: languageName: node linkType: hard -"onetime@npm:^5.1.0, onetime@npm:^5.1.2": +"onetime@npm:^5.1.2": version: 5.1.2 resolution: "onetime@npm:5.1.2" dependencies: @@ -14452,6 +14471,15 @@ __metadata: languageName: node linkType: hard +"onetime@npm:^7.0.0": + version: 7.0.0 + resolution: "onetime@npm:7.0.0" + dependencies: + mimic-function: "npm:^5.0.0" + checksum: 10/eb08d2da9339819e2f9d52cab9caf2557d80e9af8c7d1ae86e1a0fef027d00a88e9f5bd67494d350df360f7c559fbb44e800b32f310fb989c860214eacbb561c + languageName: node + linkType: hard + "open@npm:^8.0.4": version: 8.4.2 resolution: "open@npm:8.4.2" @@ -14486,20 +14514,20 @@ __metadata: languageName: node linkType: hard -"ora@npm:8.0.1": - version: 8.0.1 - resolution: "ora@npm:8.0.1" +"ora@npm:8.2.0": + version: 8.2.0 + resolution: "ora@npm:8.2.0" dependencies: chalk: "npm:^5.3.0" - cli-cursor: "npm:^4.0.0" + cli-cursor: "npm:^5.0.0" cli-spinners: "npm:^2.9.2" is-interactive: "npm:^2.0.0" is-unicode-supported: "npm:^2.0.0" log-symbols: "npm:^6.0.0" - stdin-discarder: "npm:^0.2.1" - string-width: "npm:^7.0.0" + stdin-discarder: "npm:^0.2.2" + string-width: "npm:^7.2.0" strip-ansi: "npm:^7.1.0" - checksum: 10/3d37bb3f53e965e5176004af319f82feef7323ee0b2428db5ee6f689b9b9ba939d7b1e81691d4614333c4fb9e294790eb049db9c1e990b14b9bbe150c6f09993 + checksum: 10/cea932fdcb29549cd7b5af81f427760986429cadc752b1dd4bf31bc6821f5ba137e1ef9a18cde7bdfbe5b4e3d3201e76b048765c51a27b15d18c57ac0e0a909a languageName: node linkType: hard @@ -15235,6 +15263,13 @@ __metadata: languageName: node linkType: hard +"proc-log@npm:^5.0.0": + version: 5.0.0 + resolution: "proc-log@npm:5.0.0" + checksum: 10/35610bdb0177d3ab5d35f8827a429fb1dc2518d9e639f2151ac9007f01a061c30e0c635a970c9b00c39102216160f6ec54b62377c92fac3b7bfc2ad4b98d195c + languageName: node + linkType: hard + "process-nextick-args@npm:~2.0.0": version: 2.0.1 resolution: "process-nextick-args@npm:2.0.1" @@ -16135,13 +16170,13 @@ __metadata: languageName: node linkType: hard -"restore-cursor@npm:^4.0.0": - version: 4.0.0 - resolution: "restore-cursor@npm:4.0.0" +"restore-cursor@npm:^5.0.0": + version: 5.1.0 + resolution: "restore-cursor@npm:5.1.0" dependencies: - onetime: "npm:^5.1.0" - signal-exit: "npm:^3.0.2" - checksum: 10/5b675c5a59763bf26e604289eab35711525f11388d77f409453904e1e69c0d37ae5889295706b2c81d23bd780165084d040f9b68fffc32cc921519031c4fa4af + onetime: "npm:^7.0.0" + signal-exit: "npm:^4.1.0" + checksum: 10/838dd54e458d89cfbc1a923b343c1b0f170a04100b4ce1733e97531842d7b440463967e521216e8ab6c6f8e89df877acc7b7f4c18ec76e99fb9bf5a60d358d2c languageName: node linkType: hard @@ -16335,12 +16370,12 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.6.3, semver@npm:^7.1.1, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.2, semver@npm:^7.6.3": - version: 7.6.3 - resolution: "semver@npm:7.6.3" +"semver@npm:7.7.0": + version: 7.7.0 + resolution: "semver@npm:7.7.0" bin: semver: bin/semver.js - checksum: 10/36b1fbe1a2b6f873559cd57b238f1094a053dbfd997ceeb8757d79d1d2089c56d1321b9f1069ce263dc64cfa922fa1d2ad566b39426fe1ac6c723c1487589e10 + checksum: 10/5d615860a54ff563955c451e467bff3aaf74c8d060489f936f25551d5ca05f5ac683eb46c9ed7ade082e1e53b313f205ed9c5df0b25ebb3517ec25c79e1f0d9c languageName: node linkType: hard @@ -16353,6 +16388,15 @@ __metadata: languageName: node linkType: hard +"semver@npm:^7.1.1, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.2, semver@npm:^7.6.3": + version: 7.6.3 + resolution: "semver@npm:7.6.3" + bin: + semver: bin/semver.js + checksum: 10/36b1fbe1a2b6f873559cd57b238f1094a053dbfd997ceeb8757d79d1d2089c56d1321b9f1069ce263dc64cfa922fa1d2ad566b39426fe1ac6c723c1487589e10 + languageName: node + linkType: hard + "send@npm:0.19.0": version: 0.19.0 resolution: "send@npm:0.19.0" @@ -16558,14 +16602,14 @@ __metadata: languageName: node linkType: hard -"signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7": +"signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7": version: 3.0.7 resolution: "signal-exit@npm:3.0.7" checksum: 10/a2f098f247adc367dffc27845853e9959b9e88b01cb301658cfe4194352d8d2bb32e18467c786a7fe15f1d44b233ea35633d076d5e737870b7139949d1ab6318 languageName: node linkType: hard -"signal-exit@npm:^4.0.1": +"signal-exit@npm:^4.0.1, signal-exit@npm:^4.1.0": version: 4.1.0 resolution: "signal-exit@npm:4.1.0" checksum: 10/c9fa63bbbd7431066174a48ba2dd9986dfd930c3a8b59de9c29d7b6854ec1c12a80d15310869ea5166d413b99f041bfa3dd80a7947bcd44ea8e6eb3ffeabfa1f @@ -16805,7 +16849,7 @@ __metadata: languageName: node linkType: hard -"stdin-discarder@npm:^0.2.1": +"stdin-discarder@npm:^0.2.2": version: 0.2.2 resolution: "stdin-discarder@npm:0.2.2" checksum: 10/642ffd05bd5b100819d6b24a613d83c6e3857c6de74eb02fc51506fa61dc1b0034665163831873868157c4538d71e31762bcf319be86cea04c3aba5336470478 @@ -16923,7 +16967,7 @@ __metadata: languageName: node linkType: hard -"string-width@npm:^7.0.0": +"string-width@npm:^7.2.0": version: 7.2.0 resolution: "string-width@npm:7.2.0" dependencies: @@ -17362,25 +17406,26 @@ __metadata: languageName: node linkType: hard -"syncpack@npm:^12.4.0": - version: 12.4.0 - resolution: "syncpack@npm:12.4.0" +"syncpack@npm:^13.0.0": + version: 13.0.2 + resolution: "syncpack@npm:13.0.2" dependencies: - "@effect/schema": "npm:0.69.0" - chalk: "npm:5.3.0" + "@effect/schema": "npm:0.75.5" + chalk: "npm:5.4.1" chalk-template: "npm:1.1.0" - commander: "npm:12.1.0" + commander: "npm:13.1.0" cosmiconfig: "npm:9.0.0" - effect: "npm:3.5.7" + effect: "npm:3.12.7" enquirer: "npm:2.4.1" - fast-check: "npm:3.20.0" + fast-check: "npm:3.23.2" globby: "npm:14.0.2" - minimatch: "npm:10.0.1" - npm-package-arg: "npm:11.0.3" - ora: "npm:8.0.1" + jsonc-parser: "npm:3.3.1" + minimatch: "npm:9.0.5" + npm-package-arg: "npm:12.0.1" + ora: "npm:8.2.0" prompts: "npm:2.4.2" read-yaml-file: "npm:2.1.0" - semver: "npm:7.6.3" + semver: "npm:7.7.0" tightrope: "npm:0.2.0" ts-toolbelt: "npm:9.6.0" bin: @@ -17394,7 +17439,7 @@ __metadata: syncpack-prompt: dist/bin-prompt/index.js syncpack-set-semver-ranges: dist/bin-set-semver-ranges/index.js syncpack-update: dist/bin-update/index.js - checksum: 10/5f2a6124cccbe270650946618dfbeacf9770636ca43e50ce06a368b737b3ce6f047c547b3fadecc6393acb6fa31905aa3ceead56b46e075034b64f938ff19780 + checksum: 10/0395ad413032172afc212e02f443a2901be1026ea06eae2094a2c62103581aa659cd8ac124dd20b92084514b7c702322ae872121e1bc70c398b50268e45325b6 languageName: node linkType: hard @@ -18363,6 +18408,13 @@ __metadata: languageName: node linkType: hard +"validate-npm-package-name@npm:^6.0.0": + version: 6.0.0 + resolution: "validate-npm-package-name@npm:6.0.0" + checksum: 10/4d018c4fa07f95534a5fea667adc653b1ef52f08bf56aff066c28394499d0a6949c0b00edbd7077c4dc1e041da9220af7c742ced67d7d2d6a1b07d10cbe91b29 + languageName: node + linkType: hard + "validator@npm:^13.11.0": version: 13.12.0 resolution: "validator@npm:13.12.0" From ac25d8c8729ca95e7d9153c9aa22afae9fcff8d8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 09:40:55 -0500 Subject: [PATCH 2/9] Update dependency stylelint-config-standard-scss to v14 (#2029) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- frontends/package.json | 2 +- yarn.lock | 85 ++++++++++++++++++++++++------------------ 2 files changed, 49 insertions(+), 38 deletions(-) diff --git a/frontends/package.json b/frontends/package.json index 0aedd7b9a9..72a0376482 100644 --- a/frontends/package.json +++ b/frontends/package.json @@ -69,7 +69,7 @@ "prettier": "^3.3.3", "prettier-plugin-django-alpine": "^1.2.6", "stylelint": "^16.0.0", - "stylelint-config-standard-scss": "^7.0.1", + "stylelint-config-standard-scss": "^14.0.0", "ts-node": "^10.9.2", "type-fest": "^4.18.3", "typescript": "^5.4.3" diff --git a/yarn.lock b/yarn.lock index 0000b16eb4..2c31f2cbd9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10089,7 +10089,7 @@ __metadata: prettier: "npm:^3.3.3" prettier-plugin-django-alpine: "npm:^1.2.6" stylelint: "npm:^16.0.0" - stylelint-config-standard-scss: "npm:^7.0.1" + stylelint-config-standard-scss: "npm:^14.0.0" ts-node: "npm:^10.9.2" type-fest: "npm:^4.18.3" typescript: "npm:^5.4.3" @@ -13104,6 +13104,13 @@ __metadata: languageName: node linkType: hard +"mdn-data@npm:^2.15.0": + version: 2.15.0 + resolution: "mdn-data@npm:2.15.0" + checksum: 10/1f50b10b16ae92450f0a7b64fd0519d7085d001152f34dec2238c4002f3f562cf3bff47b60b9cb82fa1d8dd6cf36f87b3c79e10079e7823b955461bb165efc90 + languageName: node + linkType: hard + "media-typer@npm:0.3.0": version: 0.3.0 resolution: "media-typer@npm:0.3.0" @@ -15020,7 +15027,7 @@ __metadata: languageName: node linkType: hard -"postcss-resolve-nested-selector@npm:^0.1.1, postcss-resolve-nested-selector@npm:^0.1.6": +"postcss-resolve-nested-selector@npm:^0.1.6": version: 0.1.6 resolution: "postcss-resolve-nested-selector@npm:0.1.6" checksum: 10/85453901afe2a4db497b4e0d2c9cf2a097a08fa5d45bc646547025176217050334e423475519a1e6c74a1f31ade819d16bb37a39914e5321e250695ee3feea14 @@ -15036,7 +15043,7 @@ __metadata: languageName: node linkType: hard -"postcss-scss@npm:^4.0.2": +"postcss-scss@npm:^4.0.9": version: 4.0.9 resolution: "postcss-scss@npm:4.0.9" peerDependencies: @@ -15045,7 +15052,7 @@ __metadata: languageName: node linkType: hard -"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4": +"postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4": version: 6.1.2 resolution: "postcss-selector-parser@npm:6.1.2" dependencies: @@ -17185,70 +17192,74 @@ __metadata: languageName: node linkType: hard -"stylelint-config-recommended-scss@npm:^9.0.0": - version: 9.0.1 - resolution: "stylelint-config-recommended-scss@npm:9.0.1" +"stylelint-config-recommended-scss@npm:^14.1.0": + version: 14.1.0 + resolution: "stylelint-config-recommended-scss@npm:14.1.0" dependencies: - postcss-scss: "npm:^4.0.2" - stylelint-config-recommended: "npm:^10.0.1" - stylelint-scss: "npm:^4.4.0" + postcss-scss: "npm:^4.0.9" + stylelint-config-recommended: "npm:^14.0.1" + stylelint-scss: "npm:^6.4.0" peerDependencies: postcss: ^8.3.3 - stylelint: ^15.0.0 + stylelint: ^16.6.1 peerDependenciesMeta: postcss: optional: true - checksum: 10/1dd358947dbf350ecc45855b700ed38349b69e3e6d9ceacbd2006fd45a0b46c96805c76e4944fdabb8a49fbc0e0986477f89ce08fe3cb50cd3057e688a803478 + checksum: 10/4dbebd9883e94eea9a6c7e1dc6978f385c4631e88a7014f41b14e2d8a5e52db6b4ac0015b41c75e8031e53c227a381b252a92ed48e6f2296c28d90fbb185f6eb languageName: node linkType: hard -"stylelint-config-recommended@npm:^10.0.1": - version: 10.0.1 - resolution: "stylelint-config-recommended@npm:10.0.1" +"stylelint-config-recommended@npm:^14.0.1": + version: 14.0.1 + resolution: "stylelint-config-recommended@npm:14.0.1" peerDependencies: - stylelint: ^15.0.0 - checksum: 10/585766be57c2f22d49f76f27b9198a0e1ec812ea56263f082cfa0aea05c50ede68250da5a50ae4d2eb19129c973ca033a6cad9a7535d2f81c78b4caf1e2eea0f + stylelint: ^16.1.0 + checksum: 10/93c3fe920902abfd3f4130173876bb633230c910a3b293f5b74a0ea9c4427d197d7ade28dd62718246264f22f1e012899d0160a0176da723d14680d73876d701 languageName: node linkType: hard -"stylelint-config-standard-scss@npm:^7.0.1": - version: 7.0.1 - resolution: "stylelint-config-standard-scss@npm:7.0.1" +"stylelint-config-standard-scss@npm:^14.0.0": + version: 14.0.0 + resolution: "stylelint-config-standard-scss@npm:14.0.0" dependencies: - stylelint-config-recommended-scss: "npm:^9.0.0" - stylelint-config-standard: "npm:^30.0.1" + stylelint-config-recommended-scss: "npm:^14.1.0" + stylelint-config-standard: "npm:^36.0.1" peerDependencies: postcss: ^8.3.3 - stylelint: ^15.0.0 + stylelint: ^16.11.0 peerDependenciesMeta: postcss: optional: true - checksum: 10/99aa0241c1ec07a36975489746f1eb15268df03ddcc5ec3370c72f507872135a1214360df7ad4f60162145b910700ee4e8b4604ee4a1c158f69eda2fd07eede4 + checksum: 10/5193b61f78f40d88828eb7565adc7b67af65e3e2f6ec52d4482214778269276495b5b5ac7ad7b0a9185ebe42a281f674e190b2ddb9673bd72b1eac5c767006a4 languageName: node linkType: hard -"stylelint-config-standard@npm:^30.0.1": - version: 30.0.1 - resolution: "stylelint-config-standard@npm:30.0.1" +"stylelint-config-standard@npm:^36.0.1": + version: 36.0.1 + resolution: "stylelint-config-standard@npm:36.0.1" dependencies: - stylelint-config-recommended: "npm:^10.0.1" + stylelint-config-recommended: "npm:^14.0.1" peerDependencies: - stylelint: ^15.0.0 - checksum: 10/db0cce181b654df4960d0c03129f3904c775628cb29a7aadfcb995034c234797b10db50640c85085bf0f2e5fbffc654b20a8c2be38c26ef670691fe7e8c86e86 + stylelint: ^16.1.0 + checksum: 10/50b8fb396f1cb8cb3539aa97187eb8c2a4b2858c897374faa726837a809dae7c686cb5dc32528c9698745d4e97af1fe9035a04a5a8cb220bd6b1530795437013 languageName: node linkType: hard -"stylelint-scss@npm:^4.4.0": - version: 4.7.0 - resolution: "stylelint-scss@npm:4.7.0" +"stylelint-scss@npm:^6.4.0": + version: 6.11.0 + resolution: "stylelint-scss@npm:6.11.0" dependencies: + css-tree: "npm:^3.0.1" + is-plain-object: "npm:^5.0.0" + known-css-properties: "npm:^0.35.0" + mdn-data: "npm:^2.15.0" postcss-media-query-parser: "npm:^0.2.3" - postcss-resolve-nested-selector: "npm:^0.1.1" - postcss-selector-parser: "npm:^6.0.11" + postcss-resolve-nested-selector: "npm:^0.1.6" + postcss-selector-parser: "npm:^7.0.0" postcss-value-parser: "npm:^4.2.0" peerDependencies: - stylelint: ^14.5.1 || ^15.0.0 - checksum: 10/6a49f1f19339c812adc1fc89bb30d0a79ab1a88082f8d18b9403893f06e4f646131d9d4f2788a2fe2847fe38ff6cf505de8a3f6358665e022f91903c7453f4c4 + stylelint: ^16.0.2 + checksum: 10/69c8adc07c34817f26311cf15fefb0d4c0a39846add4fe6589ab22c512746191fc542454a61d2b1516f64bf2c4e5ce07a505121f09be06735af957823c1872b9 languageName: node linkType: hard From 6b9e4fc160cdd6eaadcd8075fddfa88d482318b1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 09:54:43 -0500 Subject: [PATCH 3/9] Update actions/setup-python digest to 4237552 (#2022) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f08435ac3..9c5b7be36b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: virtualenvs-create: true virtualenvs-in-project: true - - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5 + - uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5 with: python-version: "3.12.6" cache: "poetry" From 324a4094cbb6f94838c72533f71a73eafeba1ac2 Mon Sep 17 00:00:00 2001 From: Nathan Levesque Date: Mon, 10 Feb 2025 10:10:17 -0500 Subject: [PATCH 4/9] Update actions/setup-python to use pyproject.toml (#2020) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c5b7be36b..bdbe10be6f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: - uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5 with: - python-version: "3.12.6" + python-version-file: "pyproject.toml" cache: "poetry" - name: Validate lockfile From 7a3e9114c10111002049ecff9b66a45594f076b3 Mon Sep 17 00:00:00 2001 From: Nathan Levesque Date: Mon, 10 Feb 2025 10:55:06 -0500 Subject: [PATCH 5/9] Remove django-debug-toolbar (#2021) --- main/settings.py | 6 ------ main/urls.py | 5 ----- poetry.lock | 17 +---------------- pyproject.toml | 1 - 4 files changed, 1 insertion(+), 28 deletions(-) diff --git a/main/settings.py b/main/settings.py index 80ebc048fe..8391121f5f 100644 --- a/main/settings.py +++ b/main/settings.py @@ -690,12 +690,6 @@ def get_all_config_keys(): "main.middleware.feature_flags.CookieFeatureFlagMiddleware", ) -# django debug toolbar only in debug mode -if DEBUG: - INSTALLED_APPS += ("debug_toolbar",) - # it needs to be enabled before other middlewares - MIDDLEWARE = ("debug_toolbar.middleware.DebugToolbarMiddleware", *MIDDLEWARE) - REST_FRAMEWORK = { "DEFAULT_PERMISSION_CLASSES": ("rest_framework.permissions.IsAuthenticated",), "DEFAULT_AUTHENTICATION_CLASSES": ( diff --git a/main/urls.py b/main/urls.py index b34382d7ba..edf5548707 100644 --- a/main/urls.py +++ b/main/urls.py @@ -66,8 +66,3 @@ + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) ) - -if settings.DEBUG: - import debug_toolbar # pylint: disable=wrong-import-position, wrong-import-order - - urlpatterns += [re_path(r"^__debug__/", include(debug_toolbar.urls))] diff --git a/poetry.lock b/poetry.lock index 99c06f832d..19d442e84b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1402,21 +1402,6 @@ files = [ asgiref = ">=3.6" django = ">=4.2" -[[package]] -name = "django-debug-toolbar" -version = "4.4.6" -description = "A configurable set of panels that display various debug information about the current request/response." -optional = false -python-versions = ">=3.8" -files = [ - {file = "django_debug_toolbar-4.4.6-py3-none-any.whl", hash = "sha256:3beb671c9ec44ffb817fad2780667f172bd1c067dbcabad6268ce39a81335f45"}, - {file = "django_debug_toolbar-4.4.6.tar.gz", hash = "sha256:36e421cb908c2f0675e07f9f41e3d1d8618dc386392ec82d23bcfcd5d29c7044"}, -] - -[package.dependencies] -django = ">=4.2.9" -sqlparse = ">=0.2" - [[package]] name = "django-filter" version = "2.4.0" @@ -7845,4 +7830,4 @@ testing = ["coverage[toml]", "zope.event", "zope.testing"] [metadata] lock-version = "2.0" python-versions = "3.12.6" -content-hash = "f733ab133945d808cb1294cb1bb99d9a34b118d57c324fcee30e0680978b0353" +content-hash = "bcb00a58e317d14f5861003db3e6bb7b73838dbe0f7521fbfac0b650f661ce96" diff --git a/pyproject.toml b/pyproject.toml index 6e32e402d8..f73965cf57 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -97,7 +97,6 @@ deepmerge = "^2.0" [tool.poetry.group.dev.dependencies] bpython = "^0.25" ddt = "^1.6.0" -django-debug-toolbar = "^4.1.0" factory_boy = "^3.3.0" faker = "^35.0.0" ipdb = "^0.13.13" From b0a007378c6f347a67fb2c281860b0c9537b3389 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 12:07:45 -0500 Subject: [PATCH 6/9] Update dependency @mui/lab to v6.0.0-beta.26 (#2023) * Update dependency @mui/lab to v6.0.0-beta.26 * add yarn.lock --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Chris Chudzicki --- frontends/ol-components/package.json | 2 +- yarn.lock | 106 ++++++++++++++++++++++++--- 2 files changed, 98 insertions(+), 10 deletions(-) diff --git a/frontends/ol-components/package.json b/frontends/ol-components/package.json index 69a20a05af..d3b17353da 100644 --- a/frontends/ol-components/package.json +++ b/frontends/ol-components/package.json @@ -19,7 +19,7 @@ "@emotion/styled": "^11.11.0", "@mitodl/smoot-design": "^3.0.1", "@mui/base": "5.0.0-beta.69", - "@mui/lab": "6.0.0-beta.24", + "@mui/lab": "6.0.0-beta.26", "@mui/material": "^6.4.1", "@mui/material-nextjs": "^6.3.1", "@mui/system": "^6.4.1", diff --git a/yarn.lock b/yarn.lock index 2c31f2cbd9..e8ee857a4b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2756,22 +2756,22 @@ __metadata: languageName: node linkType: hard -"@mui/lab@npm:6.0.0-beta.24": - version: 6.0.0-beta.24 - resolution: "@mui/lab@npm:6.0.0-beta.24" +"@mui/lab@npm:6.0.0-beta.26": + version: 6.0.0-beta.26 + resolution: "@mui/lab@npm:6.0.0-beta.26" dependencies: "@babel/runtime": "npm:^7.26.0" "@mui/base": "npm:5.0.0-beta.69" - "@mui/system": "npm:^6.4.1" + "@mui/system": "npm:^6.4.3" "@mui/types": "npm:^7.2.21" - "@mui/utils": "npm:^6.4.1" + "@mui/utils": "npm:^6.4.3" clsx: "npm:^2.1.1" prop-types: "npm:^15.8.1" peerDependencies: "@emotion/react": ^11.5.0 "@emotion/styled": ^11.3.0 - "@mui/material": ^6.4.1 - "@mui/material-pigment-css": ^6.4.1 + "@mui/material": ^6.4.3 + "@mui/material-pigment-css": ^6.4.3 "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 react: ^17.0.0 || ^18.0.0 || ^19.0.0 react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -2784,7 +2784,7 @@ __metadata: optional: true "@types/react": optional: true - checksum: 10/0187304db407e067fedfcfae75e9a7fed8a17ab3821e362874052c0d2e78f855c255aa664be993efdd8a4bdf3f0c361cb34d4924c816b0858c176ec9b40fa8e8 + checksum: 10/1d3f2f51bbd92eaa9955dbec063aa90b25954bd4f120141cfeda08c0a4f4248fb2fb8737fd96b864cc604c7fe56e48336208ec72e2d581880ffd0aba0e133bc5 languageName: node linkType: hard @@ -2864,6 +2864,23 @@ __metadata: languageName: node linkType: hard +"@mui/private-theming@npm:^6.4.3": + version: 6.4.3 + resolution: "@mui/private-theming@npm:6.4.3" + dependencies: + "@babel/runtime": "npm:^7.26.0" + "@mui/utils": "npm:^6.4.3" + prop-types: "npm:^15.8.1" + peerDependencies: + "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 + peerDependenciesMeta: + "@types/react": + optional: true + checksum: 10/c310c0e52b298890a79635edd1cdeb988fc70b24b508d904aa42e130d6265b3426e3023406fadfe855d32a6a492187a21dc30e99149df79dd8126a3f995e105f + languageName: node + linkType: hard + "@mui/styled-engine@npm:^6.4.0": version: 6.4.0 resolution: "@mui/styled-engine@npm:6.4.0" @@ -2887,6 +2904,29 @@ __metadata: languageName: node linkType: hard +"@mui/styled-engine@npm:^6.4.3": + version: 6.4.3 + resolution: "@mui/styled-engine@npm:6.4.3" + dependencies: + "@babel/runtime": "npm:^7.26.0" + "@emotion/cache": "npm:^11.13.5" + "@emotion/serialize": "npm:^1.3.3" + "@emotion/sheet": "npm:^1.4.0" + csstype: "npm:^3.1.3" + prop-types: "npm:^15.8.1" + peerDependencies: + "@emotion/react": ^11.4.1 + "@emotion/styled": ^11.3.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 + peerDependenciesMeta: + "@emotion/react": + optional: true + "@emotion/styled": + optional: true + checksum: 10/3f08e0a74bf39b668c750f244d1a95d45506e43aa464359c9c0380324cd9bdb7edce3fa059d24229515f269b8bd79d466af1e48132597a79fd303182c2864ad9 + languageName: node + linkType: hard + "@mui/system@npm:^6.4.1": version: 6.4.1 resolution: "@mui/system@npm:6.4.1" @@ -2915,6 +2955,34 @@ __metadata: languageName: node linkType: hard +"@mui/system@npm:^6.4.3": + version: 6.4.3 + resolution: "@mui/system@npm:6.4.3" + dependencies: + "@babel/runtime": "npm:^7.26.0" + "@mui/private-theming": "npm:^6.4.3" + "@mui/styled-engine": "npm:^6.4.3" + "@mui/types": "npm:^7.2.21" + "@mui/utils": "npm:^6.4.3" + clsx: "npm:^2.1.1" + csstype: "npm:^3.1.3" + prop-types: "npm:^15.8.1" + peerDependencies: + "@emotion/react": ^11.5.0 + "@emotion/styled": ^11.3.0 + "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 + peerDependenciesMeta: + "@emotion/react": + optional: true + "@emotion/styled": + optional: true + "@types/react": + optional: true + checksum: 10/8f5f09b61b1e671eed8bfbcd4308ea6540fe168fd0e3e54def16f756d2780160306ef4f9a3bd8fa83bf6171910b2309f3019de1150be827f5ee700ab7690a217 + languageName: node + linkType: hard + "@mui/types@npm:^7.2.21": version: 7.2.21 resolution: "@mui/types@npm:7.2.21" @@ -2947,6 +3015,26 @@ __metadata: languageName: node linkType: hard +"@mui/utils@npm:^6.4.3": + version: 6.4.3 + resolution: "@mui/utils@npm:6.4.3" + dependencies: + "@babel/runtime": "npm:^7.26.0" + "@mui/types": "npm:^7.2.21" + "@types/prop-types": "npm:^15.7.14" + clsx: "npm:^2.1.1" + prop-types: "npm:^15.8.1" + react-is: "npm:^19.0.0" + peerDependencies: + "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 + peerDependenciesMeta: + "@types/react": + optional: true + checksum: 10/c8ccd0fb3a3cab885c75db28a64d2c1d304716ea82998f06692291c5c5d3230636849af5c9093db5f59b426c5ff0fce7f18bd83a23c6107811cb6eb8cd4338e5 + languageName: node + linkType: hard + "@next/bundle-analyzer@npm:^14.2.15": version: 14.2.15 resolution: "@next/bundle-analyzer@npm:14.2.15" @@ -14358,7 +14446,7 @@ __metadata: "@faker-js/faker": "npm:^9.0.0" "@mitodl/smoot-design": "npm:^3.0.1" "@mui/base": "npm:5.0.0-beta.69" - "@mui/lab": "npm:6.0.0-beta.24" + "@mui/lab": "npm:6.0.0-beta.26" "@mui/material": "npm:^6.4.1" "@mui/material-nextjs": "npm:^6.3.1" "@mui/system": "npm:^6.4.1" From 38c8525a4cac4fb86b605835648c5d54400cf28d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:58:01 +0000 Subject: [PATCH 7/9] Update dependency ruff to v0.9.6 (#2033) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- poetry.lock | 40 ++++++++++++++++++++-------------------- pyproject.toml | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/poetry.lock b/poetry.lock index 19d442e84b..d0b231c1b8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -6611,29 +6611,29 @@ files = [ [[package]] name = "ruff" -version = "0.9.5" +version = "0.9.6" description = "An extremely fast Python linter and code formatter, written in Rust." optional = false python-versions = ">=3.7" files = [ - {file = "ruff-0.9.5-py3-none-linux_armv6l.whl", hash = "sha256:d466d2abc05f39018d53f681fa1c0ffe9570e6d73cde1b65d23bb557c846f442"}, - {file = "ruff-0.9.5-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:38840dbcef63948657fa7605ca363194d2fe8c26ce8f9ae12eee7f098c85ac8a"}, - {file = "ruff-0.9.5-py3-none-macosx_11_0_arm64.whl", hash = "sha256:d56ba06da53536b575fbd2b56517f6f95774ff7be0f62c80b9e67430391eeb36"}, - {file = "ruff-0.9.5-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4f7cb2a01da08244c50b20ccfaeb5972e4228c3c3a1989d3ece2bc4b1f996001"}, - {file = "ruff-0.9.5-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:96d5c76358419bc63a671caac70c18732d4fd0341646ecd01641ddda5c39ca0b"}, - {file = "ruff-0.9.5-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:deb8304636ed394211f3a6d46c0e7d9535b016f53adaa8340139859b2359a070"}, - {file = "ruff-0.9.5-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:df455000bf59e62b3e8c7ba5ed88a4a2bc64896f900f311dc23ff2dc38156440"}, - {file = "ruff-0.9.5-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:de92170dfa50c32a2b8206a647949590e752aca8100a0f6b8cefa02ae29dce80"}, - {file = "ruff-0.9.5-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3d28532d73b1f3f627ba88e1456f50748b37f3a345d2be76e4c653bec6c3e393"}, - {file = "ruff-0.9.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2c746d7d1df64f31d90503ece5cc34d7007c06751a7a3bbeee10e5f2463d52d2"}, - {file = "ruff-0.9.5-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:11417521d6f2d121fda376f0d2169fb529976c544d653d1d6044f4c5562516ee"}, - {file = "ruff-0.9.5-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:5b9d71c3879eb32de700f2f6fac3d46566f644a91d3130119a6378f9312a38e1"}, - {file = "ruff-0.9.5-py3-none-musllinux_1_2_i686.whl", hash = "sha256:2e36c61145e70febcb78483903c43444c6b9d40f6d2f800b5552fec6e4a7bb9a"}, - {file = "ruff-0.9.5-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:2f71d09aeba026c922aa7aa19a08d7bd27c867aedb2f74285a2639644c1c12f5"}, - {file = "ruff-0.9.5-py3-none-win32.whl", hash = "sha256:134f958d52aa6fdec3b294b8ebe2320a950d10c041473c4316d2e7d7c2544723"}, - {file = "ruff-0.9.5-py3-none-win_amd64.whl", hash = "sha256:78cc6067f6d80b6745b67498fb84e87d32c6fc34992b52bffefbdae3442967d6"}, - {file = "ruff-0.9.5-py3-none-win_arm64.whl", hash = "sha256:18a29f1a005bddb229e580795627d297dfa99f16b30c7039e73278cf6b5f9fa9"}, - {file = "ruff-0.9.5.tar.gz", hash = "sha256:11aecd7a633932875ab3cb05a484c99970b9d52606ce9ea912b690b02653d56c"}, + {file = "ruff-0.9.6-py3-none-linux_armv6l.whl", hash = "sha256:2f218f356dd2d995839f1941322ff021c72a492c470f0b26a34f844c29cdf5ba"}, + {file = "ruff-0.9.6-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:b908ff4df65dad7b251c9968a2e4560836d8f5487c2f0cc238321ed951ea0504"}, + {file = "ruff-0.9.6-py3-none-macosx_11_0_arm64.whl", hash = "sha256:b109c0ad2ececf42e75fa99dc4043ff72a357436bb171900714a9ea581ddef83"}, + {file = "ruff-0.9.6-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1de4367cca3dac99bcbd15c161404e849bb0bfd543664db39232648dc00112dc"}, + {file = "ruff-0.9.6-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ac3ee4d7c2c92ddfdaedf0bf31b2b176fa7aa8950efc454628d477394d35638b"}, + {file = "ruff-0.9.6-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5dc1edd1775270e6aa2386119aea692039781429f0be1e0949ea5884e011aa8e"}, + {file = "ruff-0.9.6-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:4a091729086dffa4bd070aa5dab7e39cc6b9d62eb2bef8f3d91172d30d599666"}, + {file = "ruff-0.9.6-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d1bbc6808bf7b15796cef0815e1dfb796fbd383e7dbd4334709642649625e7c5"}, + {file = "ruff-0.9.6-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:589d1d9f25b5754ff230dce914a174a7c951a85a4e9270613a2b74231fdac2f5"}, + {file = "ruff-0.9.6-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dc61dd5131742e21103fbbdcad683a8813be0e3c204472d520d9a5021ca8b217"}, + {file = "ruff-0.9.6-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:5e2d9126161d0357e5c8f30b0bd6168d2c3872372f14481136d13de9937f79b6"}, + {file = "ruff-0.9.6-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:68660eab1a8e65babb5229a1f97b46e3120923757a68b5413d8561f8a85d4897"}, + {file = "ruff-0.9.6-py3-none-musllinux_1_2_i686.whl", hash = "sha256:c4cae6c4cc7b9b4017c71114115db0445b00a16de3bcde0946273e8392856f08"}, + {file = "ruff-0.9.6-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:19f505b643228b417c1111a2a536424ddde0db4ef9023b9e04a46ed8a1cb4656"}, + {file = "ruff-0.9.6-py3-none-win32.whl", hash = "sha256:194d8402bceef1b31164909540a597e0d913c0e4952015a5b40e28c146121b5d"}, + {file = "ruff-0.9.6-py3-none-win_amd64.whl", hash = "sha256:03482d5c09d90d4ee3f40d97578423698ad895c87314c4de39ed2af945633caa"}, + {file = "ruff-0.9.6-py3-none-win_arm64.whl", hash = "sha256:0e2bb706a2be7ddfea4a4af918562fdc1bcb16df255e5fa595bbd800ce322a5a"}, + {file = "ruff-0.9.6.tar.gz", hash = "sha256:81761592f72b620ec8fa1068a6fd00e98a5ebee342a3642efd84454f3031dca9"}, ] [[package]] @@ -7830,4 +7830,4 @@ testing = ["coverage[toml]", "zope.event", "zope.testing"] [metadata] lock-version = "2.0" python-versions = "3.12.6" -content-hash = "bcb00a58e317d14f5861003db3e6bb7b73838dbe0f7521fbfac0b650f661ce96" +content-hash = "e0884953bab54cded722a7420f5f0b9b937bde05bb7327f652840e113f5fde19" diff --git a/pyproject.toml b/pyproject.toml index f73965cf57..a4bc349813 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -75,7 +75,7 @@ django-scim2 = "^0.19.1" django-oauth-toolkit = "^2.3.0" youtube-transcript-api = "^0.6.2" posthog = "^3.5.0" -ruff = "0.9.5" +ruff = "0.9.6" dateparser = "^1.2.0" uwsgitop = "^0.12" pytest-lazy-fixtures = "^1.1.1" From 62ba021f795c2b1423a9e83922af74e25bec8f0a Mon Sep 17 00:00:00 2001 From: Nathan Levesque Date: Mon, 10 Feb 2025 14:56:02 -0500 Subject: [PATCH 8/9] Add custom user model (#2015) * Adde custom user model * Use users.apps.UsersConfig --- main/settings.py | 4 +- users/migrations/0001_initial.py | 142 +++++++++++++++++- .../0002_update_user_contenttype.py | 29 ++++ users/models.py | 10 ++ 4 files changed, 179 insertions(+), 6 deletions(-) create mode 100644 users/migrations/0002_update_user_contenttype.py create mode 100644 users/models.py diff --git a/main/settings.py b/main/settings.py index 8391121f5f..ecb551307a 100644 --- a/main/settings.py +++ b/main/settings.py @@ -69,7 +69,7 @@ ALLOWED_HOSTS = ["*"] -AUTH_USER_MODEL = "auth.User" +AUTH_USER_MODEL = "users.User" SECURE_SSL_REDIRECT = get_bool("MITOL_SECURE_SSL_REDIRECT", True) # noqa: FBT003 @@ -107,7 +107,7 @@ "drf_spectacular", # Put our apps after this point "main", - "users", + "users.apps.UsersConfig", "authentication", "channels", "profiles", diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py index b90bc3412a..f4ed89b4d2 100644 --- a/users/migrations/0001_initial.py +++ b/users/migrations/0001_initial.py @@ -1,9 +1,143 @@ -# Generated by Django 4.2.18 on 2025-02-05 19:41 +# Generated by Django 4.2.18 on 2025-02-05 20:42 -from django.db import migrations +import django.contrib.auth.models +import django.contrib.auth.validators +import django.utils.timezone +from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [] + initial = True - operations = [] + dependencies = [ + ("auth", "0012_alter_user_first_name_max_length"), + ] + + operations = [ + migrations.CreateModel( + name="User", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("password", models.CharField(max_length=128, verbose_name="password")), + ( + "last_login", + models.DateTimeField( + blank=True, null=True, verbose_name="last login" + ), + ), + ( + "is_superuser", + models.BooleanField( + default=False, + help_text=( + "Designates that this user has all permissions without " + "explicitly assigning them." + ), + verbose_name="superuser status", + ), + ), + ( + "username", + models.CharField( + error_messages={ + "unique": "A user with that username already exists." + }, + help_text=( + "Required. 150 characters or fewer. " + "Letters, digits and @/./+/-/_ only." + ), + max_length=150, + unique=True, + validators=[ + django.contrib.auth.validators.UnicodeUsernameValidator() + ], + verbose_name="username", + ), + ), + ( + "first_name", + models.CharField( + blank=True, max_length=150, verbose_name="first name" + ), + ), + ( + "last_name", + models.CharField( + blank=True, max_length=150, verbose_name="last name" + ), + ), + ( + "email", + models.EmailField( + blank=True, max_length=254, verbose_name="email address" + ), + ), + ( + "is_staff", + models.BooleanField( + default=False, + help_text=( + "Designates whether the user can log into this admin site." + ), + verbose_name="staff status", + ), + ), + ( + "is_active", + models.BooleanField( + default=True, + help_text=( + "Designates whether this user should be treated as active. " + "Unselect this instead of deleting accounts." + ), + verbose_name="active", + ), + ), + ( + "date_joined", + models.DateTimeField( + default=django.utils.timezone.now, verbose_name="date joined" + ), + ), + ( + "groups", + models.ManyToManyField( + blank=True, + help_text=( + "The groups this user belongs to. A user will get all " + "permissions granted to each of their groups." + ), + related_name="user_set", + related_query_name="user", + to="auth.group", + verbose_name="groups", + ), + ), + ( + "user_permissions", + models.ManyToManyField( + blank=True, + help_text="Specific permissions for this user.", + related_name="user_set", + related_query_name="user", + to="auth.permission", + verbose_name="user permissions", + ), + ), + ], + options={ + "db_table": "auth_user", + }, + managers=[ + ("objects", django.contrib.auth.models.UserManager()), + ], + ), + ] diff --git a/users/migrations/0002_update_user_contenttype.py b/users/migrations/0002_update_user_contenttype.py new file mode 100644 index 0000000000..10971877e7 --- /dev/null +++ b/users/migrations/0002_update_user_contenttype.py @@ -0,0 +1,29 @@ +# Generated by Django 4.2.18 on 2025-02-05 22:13 + +from django.db import migrations + + +def change_user_type(apps, schema_editor): + """Update the ContentType for User to point to the custom one""" + ContentType = apps.get_model("contenttypes", "ContentType") + ct = ContentType.objects.filter(app_label="auth", model="user").first() + if ct: + ct.app_label = "users" + ct.save() + + +def revert_user_type(apps, schema_editor): + """Update the ContentType for User to point to the default django one""" + ContentType = apps.get_model("contenttypes", "ContentType") + ct = ContentType.objects.filter(app_label="users", model="user").first() + if ct: + ct.app_label = "auth" + ct.save() + + +class Migration(migrations.Migration): + dependencies = [ + ("users", "0001_initial"), + ] + + operations = [migrations.RunPython(change_user_type, revert_user_type)] diff --git a/users/models.py b/users/models.py new file mode 100644 index 0000000000..4733922bf5 --- /dev/null +++ b/users/models.py @@ -0,0 +1,10 @@ +"""Users models""" + +from django.contrib.auth.models import AbstractUser + + +class User(AbstractUser): + """Custom model for users""" + + class Meta: + db_table = "auth_user" From 37b648bb9fa38bce2f3fd4e2914b5a8f21962f18 Mon Sep 17 00:00:00 2001 From: Doof Date: Mon, 10 Feb 2025 20:06:11 +0000 Subject: [PATCH 9/9] Release 0.30.3 --- RELEASE.rst | 12 ++++++++++++ main/settings.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/RELEASE.rst b/RELEASE.rst index 8897bb9289..1f9987a7e4 100644 --- a/RELEASE.rst +++ b/RELEASE.rst @@ -1,6 +1,18 @@ Release Notes ============= +Version 0.30.3 +-------------- + +- Add custom user model (#2015) +- Update dependency ruff to v0.9.6 (#2033) +- Update dependency @mui/lab to v6.0.0-beta.26 (#2023) +- Remove django-debug-toolbar (#2021) +- Update actions/setup-python to use pyproject.toml (#2020) +- Update actions/setup-python digest to 4237552 (#2022) +- Update dependency stylelint-config-standard-scss to v14 (#2029) +- Update dependency syncpack to v13 (#2030) + Version 0.30.2 (Released February 10, 2025) -------------- diff --git a/main/settings.py b/main/settings.py index ecb551307a..54cca15b44 100644 --- a/main/settings.py +++ b/main/settings.py @@ -33,7 +33,7 @@ from main.settings_pluggy import * # noqa: F403 from openapi.settings_spectacular import open_spectacular_settings -VERSION = "0.30.2" +VERSION = "0.30.3" log = logging.getLogger()