Migrate to ruff format (#131)

* Update to ssb-pypitemplate 2025.02.19 * Formatting changes from pre-commit * Don't test on python 3.10 * Use latest nox-poetry * Remove Python 3.10 support * Update dependencies * Nox and Github Actions python versions match * Run coverage on 3.12 * Remove black, use ruff format * Use ruff format * Fix mypy
statisticsnorway · Mar 7, 2025 · 87fcf43 · 87fcf43
1 parent cd71fee
commit 87fcf43
Show file tree

Hide file tree

Showing 13 changed files with 149 additions and 163 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -19,15 +19,10 @@ repos:
       - id: check-toml
       - id: check-ast
 
-  - repo: https://github.com/ambv/black
-    rev: "25.1.0"
-    hooks:
-      - id: black
-        types: [python]
-
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.9.9
     hooks:
       - id: ruff
-        types: [python]
+        types_or: [ python, pyi ]
         args: [--fix]
+      - id: ruff-format
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,8 +3,8 @@
         "editor.codeActionsOnSave": {
             "source.fixAll": "explicit"
         },
-        "editor.defaultFormatter": "ms-python.black-formatter",
-        "editor.formatOnSave": true
+        "editor.formatOnSave": true,
+        "editor.defaultFormatter": "charliermarsh.ruff"
     },
     "python.testing.pytestArgs": [
         "tests",

diff --git a/README.md b/README.md
@@ -11,7 +11,6 @@
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=statisticsnorway_dapla-toolbelt-metadata&metric=alert_status&token=ee0a4d273db2bf811222fca5dffccd4592e3d536)][sonarquality]
 
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)][pre-commit]
-[![Black](https://img.shields.io/badge/code%20style-black-000000.svg)][black]
 [![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)
 [![Poetry](https://img.shields.io/endpoint?url=https://python-poetry.org/badge/v0.json)][poetry]
 
@@ -22,7 +21,6 @@
 [sonarcov]: https://sonarcloud.io/summary/overall?id=statisticsnorway_dapla-toolbelt-metadata
 [sonarquality]: https://sonarcloud.io/summary/overall?id=statisticsnorway_dapla-toolbelt-metadata
 [pre-commit]: https://github.com/pre-commit/pre-commit
-[black]: https://github.com/psf/black
 [poetry]: https://python-poetry.org/
 
 Tools and clients for working with the Dapla Metadata system.

diff --git a/demo/datasets/create_metadata_for_new_dataset.ipynb b/demo/datasets/create_metadata_for_new_dataset.ipynb
@@ -7,6 +7,7 @@
    "outputs": [],
    "source": [
     "from pprint import pprint\n",
+    "\n",
     "from dapla_metadata import datadoc_model as model\n",
     "from dapla_metadata.datasets import Datadoc\n",
     "\n",
@@ -30,21 +31,26 @@
     "    root=[\n",
     "        model.LanguageStringTypeItem(languageCode=\"nb\", languageText=\"Test persondata\"),\n",
     "        model.LanguageStringTypeItem(languageCode=\"nn\", languageText=\"Test persondata\"),\n",
-    "        model.LanguageStringTypeItem(languageCode=\"en\", languageText=\"Test personal data\"),\n",
-    "    ]\n",
+    "        model.LanguageStringTypeItem(\n",
+    "            languageCode=\"en\", languageText=\"Test personal data\"\n",
+    "        ),\n",
+    "    ],\n",
     ")\n",
     "meta.dataset.description = model.LanguageStringType(\n",
     "    root=[\n",
     "        model.LanguageStringTypeItem(\n",
-    "            languageCode=\"nb\", languageText=\"Data er kun for test formål\"\n",
+    "            languageCode=\"nb\",\n",
+    "            languageText=\"Data er kun for test formål\",\n",
     "        ),\n",
     "        model.LanguageStringTypeItem(\n",
-    "            languageCode=\"nn\", languageText=\"Data er kun for test formål\"\n",
+    "            languageCode=\"nn\",\n",
+    "            languageText=\"Data er kun for test formål\",\n",
     "        ),\n",
     "        model.LanguageStringTypeItem(\n",
-    "            languageCode=\"en\", languageText=\"For testing purposes only\"\n",
+    "            languageCode=\"en\",\n",
+    "            languageText=\"For testing purposes only\",\n",
     "        ),\n",
-    "    ]\n",
+    "    ],\n",
     ")\n",
     "meta.dataset.data_source = (\n",
     "    \"23\"  # Refers to code in https://www.ssb.no/klass/klassifikasjoner/712\n",
@@ -56,14 +62,17 @@
     "        model.LanguageStringTypeItem(languageCode=\"nb\", languageText=\"Inntekt\"),\n",
     "        model.LanguageStringTypeItem(languageCode=\"nn\", languageText=\"Inntekt\"),\n",
     "        model.LanguageStringTypeItem(\n",
-    "            languageCode=\"en\", languageText=\"Income\"\n",
+    "            languageCode=\"en\",\n",
+    "            languageText=\"Income\",\n",
     "        ),\n",
-    "    ]\n",
-    ")\n",
-    "meta.variables_lookup[\"inntekt\"].multiplication_factor = (\n",
-    "    1000  # Variable expressed in thousands of kroner\n",
+    "    ],\n",
     ")\n",
-    "meta.variables_lookup[\"inntekt\"].is_personal_data = model.IsPersonalData.NOT_PERSONAL_DATA"
+    "meta.variables_lookup[\n",
+    "    \"inntekt\"\n",
+    "].multiplication_factor = 1000  # Variable expressed in thousands of kroner\n",
+    "meta.variables_lookup[\n",
+    "    \"inntekt\"\n",
+    "].is_personal_data = model.IsPersonalData.NOT_PERSONAL_DATA"
    ]
   },
   {