Merge pull request #99 from statisticsnorway/update-from-template

Update to release 2024.9.10 of template

Author: arneso-ssb

.cruft.json

@@ -1,7 +1,7 @@
 {
   "template": "https://github.com/statisticsnorway/ssb-pypitemplate.git",
-  "commit": "f7f5ee76f498f10dd72f7f263516aeaff20b0b3a",
-  "checkout": "2024.4.9",
+  "commit": "e6f0ca2794354d16838cf36d97bee2f9f70d3142",
+  "checkout": "2024.9.10",
   "context": {
     "cookiecutter": {
       "project_name": "ssb-fagfunksjoner",

.github/workflows/docs.yml

@@ -34,7 +34,7 @@ jobs:
           poetry --version
 
       - name: Set up Python
-        uses: actions/setup-python@v5.1.1
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: "3.12"
           cache: "poetry"

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
           fetch-depth: 2
 
       - name: Set up Python
-        uses: actions/setup-python@v5.1.1
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: "3.12"
 
@@ -61,11 +61,11 @@ jobs:
 
       - name: Publish package on PyPI
         if: steps.check-version.outputs.tag
-        uses: pypa/gh-action-pypi-publish@v1.9.0
+        uses: pypa/gh-action-pypi-publish@v1.10.1
 
       - name: Publish package on TestPyPI
         if: (!steps.check-version.outputs.tag)
-        uses: pypa/gh-action-pypi-publish@v1.9.0
+        uses: pypa/gh-action-pypi-publish@v1.10.1
         with:
           repository-url: https://test.pypi.org/legacy/
 

.github/workflows/tests.yml

@@ -38,7 +38,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v5.1.1
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ matrix.python }}
 
@@ -103,6 +103,7 @@ jobs:
         with:
           name: coverage-data-${{ matrix.os }}-${{ matrix.python }}
           path: ".coverage.*"
+          include-hidden-files: true
 
       - name: Upload documentation
         if: matrix.session == 'docs-build'
@@ -121,7 +122,7 @@ jobs:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Set up Python
-        uses: actions/setup-python@v5.1.1
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: "3.12"
 
@@ -168,4 +169,4 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         # No need to run SonarCloud analysis if dependabot update or token not defined
         if: env.SONAR_TOKEN != '' && (github.actor != 'dependabot[bot]')
-        uses: SonarSource/sonarcloud-github-action@v2.3.0
+        uses: SonarSource/sonarcloud-github-action@v3.0.0

.gitignore

@@ -208,3 +208,6 @@ rsconnect/
 # Blaise specific ignores
 *.bdix
 *.bdbx
+
+# PyCharm
+.idea/

poetry.lock

@@ -90,6 +90,7 @@ pretty = true
 show_column_numbers = true
 show_error_context = true
 exclude = ["tests", "docs", "noxfile.py"]
+warn_unused_ignores = false  # Remove when not supporting python 3.10
 
 [[tool.mypy.overrides]]
 module = [

pyproject.toml

@@ -13,16 +13,18 @@ def cast_pyarrow_table_schema(data: pa.Table, schema: pa.Schema) -> pa.Table:
     Returns:
         pa.Table: A new pyarrow table with correct schema.
     """
+    # Pyarrow has only partial type hints. All type: ignore in this function has been
+    # checked with the pyarrow documentation, and the implementation is correct.
     newdata = []
     newnames = []
     for field in schema:
-        if type(field.type) is pa.DictionaryType:
-            new = data.column(field.name).dictionary_encode().cast(field.type)
+        if type(field.type) is pa.DictionaryType:  # type: ignore
+            new = data.column(field.name).dictionary_encode().cast(field.type)  # type: ignore
         else:
-            new = data.column(field.name).cast(field.type)
+            new = data.column(field.name).cast(field.type)  # type: ignore
         newdata.append(new)
         newnames.append(field.name)
-    return pa.table(newdata, names=newnames)
+    return pa.table(newdata, names=newnames)  # type: ignore
 
 
 def restructur_pyarrow_schema(
@@ -46,17 +48,19 @@ def restructur_pyarrow_schema(
         pa.Schema: A new pyarrow schema that has the same order as the in use schema,
             but with the correct datatypes from the schema that we want.
     """
+    # Pyarrow has only partial type hints. All type: ignore in this function has been
+    # checked with the pyarrow documentation, and the implementation is correct.
     for col in inuse_schema.names:
         assert col in wanted_schema.names
     newfields = []
     for name in inuse_schema.names:
         inuse_field_index = inuse_schema.get_field_index(name)
         wanted_field_index = wanted_schema.get_field_index(name)
-        inuse_field = inuse_schema.field(inuse_field_index)
-        wanted_field = wanted_schema.field(wanted_field_index)
+        inuse_field = inuse_schema.field(inuse_field_index)  # type: ignore
+        wanted_field = wanted_schema.field(wanted_field_index)  # type:ignore
 
-        if type(inuse_field.type) is type(wanted_field.type):
-            newfields.append(inuse_field.with_type(wanted_field.type))
+        if type(inuse_field.type) is type(wanted_field.type):  # type: ignore
+            newfields.append(inuse_field.with_type(wanted_field.type))  # type: ignore
         else:
             newfields.append(wanted_field)
     return pa.schema(newfields)