Merge pull request #201 from statisticsnorway/cruft-update

Update to template version 2026.1.7

Author: aecorn

.cookiecutter.json

@@ -1,4 +1,5 @@
 {
+  "_commit": "1b94f545381a9ce08e205e7451d7a4f07eaef142",
   "_copy_without_render": [
     "*.rst_t"
   ],
@@ -20,5 +21,5 @@
   "license": "MIT",
   "package_name": "fagfunksjoner",
   "project_name": "ssb-fagfunksjoner",
-  "version": "0.1.10"
+  "version": "1.1.2"
 }

.cruft.json

@@ -1,7 +1,7 @@
 {
   "template": "https://github.com/statisticsnorway/ssb-pypitemplate.git",
-  "commit": "9e3c49f6680d4c400567c39d70b768f0a322c95e",
-  "checkout": "2025.7.18",
+  "commit": "1b94f545381a9ce08e205e7451d7a4f07eaef142",
+  "checkout": "2026.1.7",
   "context": {
     "cookiecutter": {
       "project_name": "ssb-fagfunksjoner",
@@ -12,7 +12,7 @@
       "author": "Carl F. Corneil",
       "email": "cfc@ssb.no",
       "github_organization": "statisticsnorway",
-      "version": "0.1.10",
+      "version": "1.1.2",
       "license": "MIT",
       "development_status": "Development Status :: 4 - Beta",
       "code_quality_level": "Medium",
@@ -26,7 +26,7 @@
         "trim_blocks": true
       },
       "_template": "https://github.com/statisticsnorway/ssb-pypitemplate.git",
-      "_commit": "9e3c49f6680d4c400567c39d70b768f0a322c95e"
+      "_commit": "1b94f545381a9ce08e205e7451d7a4f07eaef142"
     }
   },
   "directory": null

.darglint

@@ -37,6 +37,9 @@ demos/*.xml
 # See https://adr.ssb.no/0020-lagringsformat-for-jupyter-notebooks/
 *.ipynb
 
+# Exclude generated documentation
+/docs/_build/
+
 
 # The section below is from the GitHub .gitignore template for Python:
 # https://raw.githubusercontent.com/github/gitignore/main/Python.gitignore

.gitignore

@@ -62,9 +62,9 @@ repos:
         entry: check-ast
         language: system
         types: [python]
-      - id: darglint
-        name: darglint
-        entry: darglint
+      - id: pydoclint
+        name: pydoclint
+        entry: pydoclint
         language: system
         types: [python]
       - id: ruff

.pre-commit-config.yaml

@@ -50,15 +50,13 @@ Check if you are on Dapla or in prodsone.
 ```python
 from fagfunksjoner import check_env
 
-
 check_env()
 ```
 
 Navigate to the root of your project and back again. Do stuff while in root, like importing local functions.
 ```python
 from fagfunksjoner import ProjectRoot
 
-
 with ProjectRoot():
     ... # Do your local imports here...
 ```
@@ -69,7 +67,6 @@ Setting up password with saspy
 ```python
 from fagfunksjoner.prodsone import saspy_ssb
 
-
 saspy_ssb.set_password() # Follow the instructions to set the password
 saspy_ssb.saspy_df_from_path("path")
 ```
@@ -80,7 +77,6 @@ import logging
 
 from fagfunksjoner.log.statlogger import StatLogger
 
-
 # Ved å opprette StatLogger så "hijacker" den den vanlige loggeren
 root_logger = StatLogger(log_file="custom_log_file.log")
 # I tillegg sørger vi for at den ikke blir ryddet bort av Python, ved å assigne den til en variabel?
@@ -95,7 +91,6 @@ logger.info("This is an info message")
 ```python
 from fagfunksjoner import make_klass_xml_codelist
 
-
 make_klass_xml_codelist(path="kjoenn.xml",
     codes=["1", "2"],
     names_bokmaal=["Mann", "Kvinne"])
@@ -109,7 +104,6 @@ import pandas as pd
 
 from fagfunksjoner import round_up
 
-
 print(round(2.5, 0), round_up(2.5, 0))
 
 round_up(pd.Series([1.5, 2.5, 3.5]), 0)  # Datatype blir Int64 når man runder til 0 desimaler
@@ -132,7 +126,6 @@ Aggregate on all exclusive combinations of codes in certain columns (maybe befor
 ```python
 from fagfunksjoner import all_combos_agg
 
-
 ialt_koder = {
 "skolefylk": "01-99",
 "almyrk": "00",
@@ -151,7 +144,6 @@ To aggregate on NON-EXCLUSIVE combinations of codes in certain columns, use the
 ```python
 from fagfunksjoner import all_combos_agg_inclusive
 
-
 category_mappings = {
     "Alder": {
         "15-24": range(15, 25),
@@ -202,7 +194,6 @@ Perform mapping using SsbFormat. Behaves like a dictionary. Has functionality fo
 ```python
 from fagfunksjoner import SsbFormat
 
-
 age_frmt = {
 'low-18': '-18',
 '19-25': '19-25',
@@ -224,7 +215,6 @@ print(df['age_group'].value_counts())
 # save format
 from fagfunksjoner.formats import store_format
 
-
 store_format(path+'format_name_p2025-02.json')
 
 # or
@@ -234,7 +224,6 @@ ssb_age_frmt.store(path + 'format_name_p2025-02.json', force=True)
 # read format/import format (dictionary saved as .json) as SsbFormat
 from fagfunksjoner.formats import get_format
 
-
 some_frmt = get_format(path+'format_name.json')
 ```
 
@@ -245,7 +234,6 @@ We have "flat files", which are not comma seperated. These need metadata to corr
 ```python
 from fagfunksjoner import open_path_datadok
 
-
 archive_object = open_path_datadok("$TBF/project/arkiv/filename/g2022g2023")
 # The object now has several important attributes
 archive_object.df  # The Dataframe of the archived data
@@ -274,7 +262,6 @@ from dotenv import load_dotenv
 
 from fagfunksjoner.prodsone import Oracle
 
-
 load_dotenv()
 
 query = "select vare, pris from my_db_table"
@@ -296,7 +283,6 @@ from dotenv import load_dotenv
 
 from fagfunksjoner.prodsone import Oracle
 
-
 load_dotenv()
 
 query = "select vare, pris from my_db_table"
@@ -319,7 +305,6 @@ from dotenv import load_dotenv
 
 from fagfunksjoner.prodsone import Oracle
 
-
 load_dotenv()
 
 df = pd.DataFrame(

README.md

@@ -16,15 +16,13 @@
 # %%
 import os
 
-
 os.chdir("../")
 # %%
 import pandas as pd
 from IPython.display import display
 
 from fagfunksjoner import all_combos_agg
 
-
 data = {
     "alder": [20, 60, 33, 33, 20],
     "kommune": ["0301", "3001", "0301", "5401", "0301"],

demos/all_combos_demo.py

@@ -15,7 +15,6 @@
 # %%
 from fagfunksjoner import open_path_datadok
 
-
 # %%
 tiar = "$UTD/gjfor_vgo/arkiv/tiar/g2013g2023"
 arkivfil = open_path_datadok(tiar)

demos/datadok_extract.py

@@ -1,6 +1,5 @@
 from fagfunksjoner.data.klass_xml import make_klass_xml_codelist
 
-
 # ### Using the main parameters
 
 # Define your classification codes and names

demos/demo_klass_xml.py

@@ -18,7 +18,6 @@
 
 from fagfunksjoner import ProjectRoot
 
-
 # %%
 print(os.getcwd())