Merge pull request #103 from statisticsnorway/update

Update

.cruft.json

@@ -1,7 +1,7 @@
 {
   "template": "https://github.com/statisticsnorway/ssb-pypitemplate.git",
-  "commit": "e6f0ca2794354d16838cf36d97bee2f9f70d3142",
-  "checkout": "2024.9.10",
+  "commit": "66884cffa5aa67ed505bb121009501b51cc4d847",
+  "checkout": null,
   "context": {
     "cookiecutter": {
       "project_name": "ssb-arbmark-fagfunksjoner",
@@ -23,7 +23,8 @@
         "lstrip_blocks": true,
         "trim_blocks": true
       },
-      "_template": "https://github.com/statisticsnorway/ssb-pypitemplate.git"
+      "_template": "https://github.com/statisticsnorway/ssb-pypitemplate.git",
+      "_commit": "66884cffa5aa67ed505bb121009501b51cc4d847"
     }
   },
   "directory": null

.github/workflows/release.yml

@@ -32,7 +32,8 @@ jobs:
 
       - name: Install Poetry
         run: |
-          pip install -c ${{ github.workspace }}/.github/workflows/constraints.txt poetry
+          pipx install --pip-args "-c ${{ github.workspace }}/.github/workflows/constraints.txt" poetry
+          pipx inject poetry poetry-plugin-export
           poetry --version
 
       - name: Check if there is a parent commit

.github/workflows/tests.yml

@@ -59,6 +59,7 @@ jobs:
       - name: Install Poetry
         run: |
           pipx install --pip-args "-c ${{ github.workspace }}/.github/workflows/constraints.txt" poetry
+          pipx inject poetry poetry-plugin-export
           poetry --version
 
       - name: Install Nox
@@ -123,7 +124,7 @@ jobs:
       - name: Set up Python
         uses: actions/[email protected]
         with:
-          python-version: "3.12"
+          python-version: "3.10"
 
       - name: Upgrade pip
         run: |
@@ -133,6 +134,7 @@ jobs:
       - name: Install Poetry
         run: |
           pipx install --pip-args "-c ${{ github.workspace }}/.github/workflows/constraints.txt" poetry
+          pipx inject poetry poetry-plugin-export
           poetry --version
 
       - name: Install Nox

.pre-commit-config.yaml

@@ -23,19 +23,16 @@ repos:
         entry: end-of-file-fixer
         language: system
         types: [text]
-        stages: [commit, push, manual]
       - id: trailing-whitespace
         name: Trim Trailing Whitespace
         entry: trailing-whitespace-fixer
         language: system
         types: [text]
-        stages: [commit, push, manual]
       - id: mixed-line-ending
         name: Mixed Line Ending
         entry: mixed-line-ending
         language: system
         types: [text]
-        stages: [commit, push, manual]
 
       # Serialization format checkers
       - id: check-yaml
@@ -65,7 +62,6 @@ repos:
         entry: darglint
         language: system
         types: [python]
-        stages: [manual]
       - id: ruff
         name: ruff
         entry: ruff check --fix --exit-non-zero-on-fix

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ssb-arbmark-fagfunksjoner"
-version = "0.0.27"
+version = "0.0.28"
 description = "SSB Arbeidsmarked og lønn Fag-fellesfunksjoner"
 authors = ["Jan Sebastian Rothe <[email protected]>"]
 license = "MIT"
@@ -42,6 +42,7 @@ sphinx-click = ">=3.0.2"
 typeguard = ">=2.13.3"
 xdoctest = { extras = ["colors"], version = ">=0.15.10" }
 myst-parser = { version = ">=0.16.1" }
+cruft = ">=2.16.0"
 
 [tool.pytest.ini_options]
 pythonpath = ["src"]
@@ -98,8 +99,6 @@ select = [
     "RUF",  # the ruff developer's own rules
 ]
 ignore = [
-    "ANN101", # Supress missing-type-self.
-    "ANN102", # Supress missing-type-cls.
     "ANN202", # Don't requiere return type annotation for private functions.
     "ANN401", # Allow type annotation with type Any.
     "D100",   # Supress undocumented-public-module. Only doc of public api required.

src/arbmark/__init__.py

@@ -39,42 +39,42 @@
 from arbmark.groups.shift_work import turnuskoder
 
 __all__ = [
-    "proc_sums",
-    "read_latest",
-    "pinterval",
-    "indicate_merge",
-    "first_last_date_quarter",
-    "ref_day",
-    "ref_tuesday",
-    "ref_week",
-    "sb_integer",
-    "sb_percent",
+    "alder_5grp",
+    "alder_grp",
+    "categorize_ranges",
+    "classify_county_not_mainland",
+    "classify_mainland_not_mainland",
+    "clean_nace_17_groups",
     "count_days",
     "count_holidays",
     "count_weekend_days",
-    "count_workdays",
     "count_weekend_days",
+    "count_workdays",
     "filter_holidays",
     "filter_weekends",
     "filter_workdays",
+    "first_last_date_quarter",
     "get_calendar",
     "get_norwegian_holidays",
+    "get_regional_special_codes",
+    "get_valid_county_codes",
     "get_years",
+    "indicate_merge",
     "is_weekend",
-    "numpy_dates",
-    "alder_grp",
-    "alder_5grp",
-    "virk_str_8grp",
     "landbakgrunn_grp",
-    "clean_nace_17_groups",
-    "nace_to_17_groups",
     "nace_sn07_47grp",
+    "nace_to_17_groups",
+    "numpy_dates",
+    "nyk08yrkeregsys1",
+    "pinterval",
+    "proc_sums",
+    "read_latest",
+    "ref_day",
+    "ref_tuesday",
+    "ref_week",
+    "sb_integer",
+    "sb_percent",
     "sektor2_grp",
     "turnuskoder",
-    "get_valid_county_codes",
-    "get_regional_special_codes",
-    "classify_mainland_not_mainland",
-    "classify_county_not_mainland",
-    "nyk08yrkeregsys1",
-    "categorize_ranges",
+    "virk_str_8grp",
 ]