Update deps and move away from black to ruff format (#887)

.pre-commit-config.yaml

@@ -6,11 +6,7 @@ exclude: >
   )
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.1.11
+    rev: v0.3.5
     hooks:
       - id: ruff
-  - repo: https://github.com/psf/black
-    rev: 23.12.1
-    hooks:
-      - id: black
-        language_version: python3
+      - id: ruff-format

bin/run-tests.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -ex
-black --check .
 ruff check .
+ruff format --check .
 urlwait
 python manage.py makemigrations | grep "No changes detected"
 bin/post-deploy.sh

pyproject.toml

@@ -2,7 +2,7 @@
 [tool.ruff]
 # Set what ruff should check for.
 # See https://beta.ruff.rs/docs/rules/ for a list of rules.
-select = [
+lint.select = [
     # TODO: Enable flake8-builtin and fix errors to fix variable name shadowing errors.
     # "A", # flake8-builtin errors.
     # TODO: Enable bugbear and fix errors.
@@ -18,18 +18,13 @@ line-length = 150
 target-version = 'py312'
 extend-exclude = ["__pycache__", "docs", "assets", "static", "bedrock/externalfiles/files_cache"]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "nucleus/settings.py" = ["F405"]
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 known-first-party = ["nucleus", "base", "rna", "lib", "pages"]
 section-order = ["future", "standard-library", "django", "third-party", "first-party", "local-folder"]
 combine-as-imports = true
 
-[tool.ruff.isort.sections]
+[tool.ruff.lint.isort.sections]
 django = ["django"]
-
-[tool.black]
-line-length = 150
-target-version = ['py312']
-include = '\.pyi?$'

requirements/dev.in

@@ -1,7 +1,6 @@
 -r prod.in
 
-black==23.12.1
-ruff==0.1.11
+ruff==0.3.5
 Markdown==3.5.1  # is this definitely needed on the Python side?
 pytest-datadir==1.5.0
-pytest-django==4.7.0
+pytest-django==4.8.0

requirements/dev.txt

@@ -1,39 +1,11 @@
-# SHA1:cef0638344d922b5fc579300ff3e9a2dadc5622b
+# SHA1:123e77e7329a31d67ac6c7c76e0641cd3e7a6285
 # Please recompile requirements inside the Docker image, not on your local, host machine.
 #
 # To do this, just use the following from your host:
 #
 # $ make compile-requirements
 #
 -r prod.txt
-black==23.12.1 \
-    --hash=sha256:0808494f2b2df923ffc5723ed3c7b096bd76341f6213989759287611e9837d50 \
-    --hash=sha256:1fa88a0f74e50e4487477bc0bb900c6781dbddfdfa32691e780bf854c3b4a47f \
-    --hash=sha256:25e57fd232a6d6ff3f4478a6fd0580838e47c93c83eaf1ccc92d4faf27112c4e \
-    --hash=sha256:2d9e13db441c509a3763a7a3d9a49ccc1b4e974a47be4e08ade2a228876500ec \
-    --hash=sha256:3e1b38b3135fd4c025c28c55ddfc236b05af657828a8a6abe5deec419a0b7055 \
-    --hash=sha256:3fa4be75ef2a6b96ea8d92b1587dd8cb3a35c7e3d51f0738ced0781c3aa3a5a3 \
-    --hash=sha256:4ce3ef14ebe8d9509188014d96af1c456a910d5b5cbf434a09fef7e024b3d0d5 \
-    --hash=sha256:4f0031eaa7b921db76decd73636ef3a12c942ed367d8c3841a0739412b260a54 \
-    --hash=sha256:602cfb1196dc692424c70b6507593a2b29aac0547c1be9a1d1365f0d964c353b \
-    --hash=sha256:6d1bd9c210f8b109b1762ec9fd36592fdd528485aadb3f5849b2740ef17e674e \
-    --hash=sha256:78baad24af0f033958cad29731e27363183e140962595def56423e626f4bee3e \
-    --hash=sha256:8d4df77958a622f9b5a4c96edb4b8c0034f8434032ab11077ec6c56ae9f384ba \
-    --hash=sha256:97e56155c6b737854e60a9ab1c598ff2533d57e7506d97af5481141671abf3ea \
-    --hash=sha256:9c4352800f14be5b4864016882cdba10755bd50805c95f728011bcb47a4afd59 \
-    --hash=sha256:a4d6a9668e45ad99d2f8ec70d5c8c04ef4f32f648ef39048d010b0689832ec6d \
-    --hash=sha256:a920b569dc6b3472513ba6ddea21f440d4b4c699494d2e972a1753cdc25df7b0 \
-    --hash=sha256:ae76c22bde5cbb6bfd211ec343ded2163bba7883c7bc77f6b756a1049436fbb9 \
-    --hash=sha256:b18fb2ae6c4bb63eebe5be6bd869ba2f14fd0259bda7d18a46b764d8fb86298a \
-    --hash=sha256:c04b6d9d20e9c13f43eee8ea87d44156b8505ca8a3c878773f68b4e4812a421e \
-    --hash=sha256:c88b3711d12905b74206227109272673edce0cb29f27e1385f33b0163c414bba \
-    --hash=sha256:dd15245c8b68fe2b6bd0f32c1556509d11bb33aec9b5d0866dd8e2ed3dba09c2 \
-    --hash=sha256:e0aaf6041986767a5e0ce663c7a2f0e9eaf21e6ff87a5f95cbf3675bfd4c41d2
-    # via -r requirements/dev.in
-click==8.1.7 \
-    --hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \
-    --hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de
-    # via black
 iniconfig==2.0.0 \
     --hash=sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3 \
     --hash=sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374
@@ -42,52 +14,40 @@ markdown==3.5.1 \
     --hash=sha256:5874b47d4ee3f0b14d764324d2c94c03ea66bee56f2d929da9f2508d65e722dc \
     --hash=sha256:b65d7beb248dc22f2e8a31fb706d93798093c308dc1aba295aedeb9d41a813bd
     # via -r requirements/dev.in
-mypy-extensions==1.0.0 \
-    --hash=sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d \
-    --hash=sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782
-    # via black
-pathspec==0.12.1 \
-    --hash=sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08 \
-    --hash=sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712
-    # via black
-platformdirs==4.1.0 \
-    --hash=sha256:11c8f37bcca40db96d8144522d925583bdb7a31f7b0e37e3ed4318400a8e2380 \
-    --hash=sha256:906d548203468492d432bcb294d4bc2fff751bf84971fbb2c10918cc206ee420
-    # via black
-pluggy==1.3.0 \
-    --hash=sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12 \
-    --hash=sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7
+pluggy==1.4.0 \
+    --hash=sha256:7db9f7b503d67d1c5b95f59773ebb58a8c1c288129a88665838012cfb07b8981 \
+    --hash=sha256:8c85c2876142a764e5b7548e7d9a0e0ddb46f5185161049a79b7e974454223be
     # via pytest
-pytest==7.4.4 \
-    --hash=sha256:2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280 \
-    --hash=sha256:b090cdf5ed60bf4c45261be03239c2c1c22df034fbffe691abe93cd80cea01d8
+pytest==8.1.1 \
+    --hash=sha256:2a8386cfc11fa9d2c50ee7b2a57e7d898ef90470a7a34c4b949ff59662bb78b7 \
+    --hash=sha256:ac978141a75948948817d360297b7aae0fcb9d6ff6bc9ec6d514b85d5a65c044
     # via
     #   pytest-datadir
     #   pytest-django
 pytest-datadir==1.5.0 \
     --hash=sha256:1617ed92f9afda0c877e4eac91904b5f779d24ba8f5e438752e3ae39d8d2ee3f \
     --hash=sha256:34adf361bcc7b37961bbc1dfa8d25a4829e778bab461703c38a5c50ca9c36dc8
     # via -r requirements/dev.in
-pytest-django==4.7.0 \
-    --hash=sha256:4e1c79d5261ade2dd58d91208017cd8f62cb4710b56e012ecd361d15d5d662a2 \
-    --hash=sha256:92d6fd46b1d79b54fb6b060bbb39428073396cec717d5f2e122a990d4b6aa5e8
+pytest-django==4.8.0 \
+    --hash=sha256:5d054fe011c56f3b10f978f41a8efb2e5adfc7e680ef36fb571ada1f24779d90 \
+    --hash=sha256:ca1ddd1e0e4c227cf9e3e40a6afc6d106b3e70868fd2ac5798a22501271cd0c7
     # via -r requirements/dev.in
-ruff==0.1.11 \
-    --hash=sha256:09c415716884950080921dd6237767e52e227e397e2008e2bed410117679975b \
-    --hash=sha256:0f58948c6d212a6b8d41cd59e349751018797ce1727f961c2fa755ad6208ba45 \
-    --hash=sha256:190a566c8f766c37074d99640cd9ca3da11d8deae2deae7c9505e68a4a30f740 \
-    --hash=sha256:231d8fb11b2cc7c0366a326a66dafc6ad449d7fcdbc268497ee47e1334f66f77 \
-    --hash=sha256:4b077ce83f47dd6bea1991af08b140e8b8339f0ba8cb9b7a484c30ebab18a23f \
-    --hash=sha256:5b25093dad3b055667730a9b491129c42d45e11cdb7043b702e97125bcec48a1 \
-    --hash=sha256:6464289bd67b2344d2a5d9158d5eb81025258f169e69a46b741b396ffb0cda95 \
-    --hash=sha256:934832f6ed9b34a7d5feea58972635c2039c7a3b434fe5ba2ce015064cb6e955 \
-    --hash=sha256:97ce4d752f964ba559c7023a86e5f8e97f026d511e48013987623915431c7ea9 \
-    --hash=sha256:9b8f397902f92bc2e70fb6bebfa2139008dc72ae5177e66c383fa5426cb0bf2c \
-    --hash=sha256:9bd4025b9c5b429a48280785a2b71d479798a69f5c2919e7d274c5f4b32c3607 \
-    --hash=sha256:a7f772696b4cdc0a3b2e527fc3c7ccc41cdcb98f5c80fdd4f2b8c50eb1458196 \
-    --hash=sha256:c4a88efecec23c37b11076fe676e15c6cdb1271a38f2b415e381e87fe4517f18 \
-    --hash=sha256:e1ad00662305dcb1e987f5ec214d31f7d6a062cae3e74c1cbccef15afd96611d \
-    --hash=sha256:ea0d3e950e394c4b332bcdd112aa566010a9f9c95814844a7468325290aabfd9 \
-    --hash=sha256:eb85ee287b11f901037a6683b2374bb0ec82928c5cbc984f575d0437979c521a \
-    --hash=sha256:f9d4d88cb6eeb4dfe20f9f0519bd2eaba8119bde87c3d5065c541dbae2b5a2cb
+ruff==0.3.5 \
+    --hash=sha256:122de171a147c76ada00f76df533b54676f6e321e61bd8656ae54be326c10296 \
+    --hash=sha256:3a05f3793ba25f194f395578579c546ca5d83e0195f992edc32e5907d142bfa3 \
+    --hash=sha256:5e55771559c89272c3ebab23326dc23e7f813e492052391fe7950c1a5a139d89 \
+    --hash=sha256:712e71283fc7d9f95047ed5f793bc019b0b0a29849b14664a60fd66c23b96da1 \
+    --hash=sha256:87258e0d4b04046cf1d6cc1c56fadbf7a880cc3de1f7294938e923234cf9e498 \
+    --hash=sha256:89b1e92b3bd9fca249153a97d23f29bed3992cff414b222fcd361d763fc53f12 \
+    --hash=sha256:9d8605aa990045517c911726d21293ef4baa64f87265896e491a05461cae078d \
+    --hash=sha256:a067daaeb1dc2baf9b82a32dae67d154d95212080c80435eb052d95da647763d \
+    --hash=sha256:a532a90b4a18d3f722c124c513ffb5e5eaff0cc4f6d3aa4bda38e691b8600c9f \
+    --hash=sha256:a759d33a20c72f2dfa54dae6e85e1225b8e302e8ac655773aff22e542a300985 \
+    --hash=sha256:a7b6e63194c68bca8e71f81de30cfa6f58ff70393cf45aab4c20f158227d5936 \
+    --hash=sha256:aef5bd3b89e657007e1be6b16553c8813b221ff6d92c7526b7e0227450981eac \
+    --hash=sha256:d80a6b18a6c3b6ed25b71b05eba183f37d9bc8b16ace9e3d700997f00b74660b \
+    --hash=sha256:dabc62195bf54b8a7876add6e789caae0268f34582333cda340497c886111c39 \
+    --hash=sha256:dc56bb16a63c1303bd47563c60482a1512721053d93231cf7e9e1c6954395a0e \
+    --hash=sha256:dfd3504e881082959b4160ab02f7a205f0fadc0a9619cc481982b6837b2fd4c0 \
+    --hash=sha256:faeeae9905446b975dcf6d4499dc93439b131f1443ee264055c5716dd947af55
     # via -r requirements/dev.in

requirements/prod.in

@@ -7,25 +7,25 @@ django-cache-url==3.4.5
 django-crum==0.7.9
 django-csp==3.7
 django-extensions==3.2.3
-django-filter==23.5
+django-filter==24.2
 django-jinja==2.11.0
 django-pagedown==2.2.1
 django-session-csrf==0.7.1
 django-watchman==1.3.0
-Django==4.2.9
+Django==4.2.11
 djangorestframework==3.14.0
 entrypoints==0.4
-Jinja2==3.1.2
-more-itertools==10.1.0
-mozilla-django-oidc==3.0.0
-newrelic==9.3.0
+Jinja2==3.1.3
+more-itertools==10.2.0
+mozilla-django-oidc==4.0.1
+newrelic==9.8.0
 Pillow>=10.2.0  # hard-base pin for security
 psycopg2-binary==2.9.9
 PyGithub==2.1.1
 python-decouple==3.8
 redis==5.0.1
 requests==2.31.0  # hard pin to force security bump for now
-sentry-sdk==1.39.1
+sentry-sdk==1.44.0
 sentry-processor==0.0.1
 spinach==0.0.17
 sqlparse==0.4.4