Update all dependencies and code

DanielNoord · Nov 14, 2023 · 7276b47 · 7276b47 · github-actions · Nov 14, 2023
1 parent 7ba2055
commit 7276b47
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 28 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -18,8 +18,8 @@ repos:
         additional_dependencies:
           - beautifulsoup4~=4.12
           - openpyxl~=3.1
-          - requests~=2.28
-          - Babel~=2.12
+          - requests~=2.31
+          - Babel~=2.13
   - repo: https://github.com/PyCQA/autoflake
     rev: v2.2.1
     hooks:
@@ -31,7 +31,7 @@ repos:
           - --remove-duplicate-keys
           - --remove-unused-variables
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.13.0
+    rev: v3.15.0
     hooks:
       - id: pyupgrade
         args: [--py311-plus]
@@ -40,28 +40,27 @@ repos:
     hooks:
       - id: isort
         args: ["--profile", "black"]
-  - repo: https://github.com/psf/black
-    rev: 23.9.1
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 23.11.0
     hooks:
       - id: black
-        args: [--quiet]
   - repo: https://github.com/pycqa/pylint
-    rev: v3.0.0
+    rev: v3.0.1
     hooks:
       - id: pylint
         args: ["--disable=fixme"]
         additional_dependencies:
-          - Babel~=2.12
+          - Babel~=2.13
           - beautifulsoup4~=4.12
           - geocoder~=1.38
-          - lxml~=4.8
+          - lxml~=4.9
           - openpyxl~=3.1
-          - python-docx~=0.8
-          - requests~=2.28
+          - python-docx~=1.1
+          - requests~=2.31
           - sparql-client~=3.8
           - wikidataintegrator~=0.9
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.5.1
+    rev: v1.7.0
     hooks:
       - id: mypy
         args: [--config-file=pyproject.toml]
@@ -70,7 +69,7 @@ repos:
           - openpyxl-stubs~=0.1
           - types-babel~=2.11
           - types-beautifulsoup4~=4.12
-          - types-requests~=2.28
+          - types-requests~=2.31
   - repo: https://github.com/DanielNoord/pydocstringformatter
     rev: v0.7.3
     hooks:

diff --git a/python/database_searches/search_cultura_italia.py b/python/database_searches/search_cultura_italia.py
@@ -1,6 +1,6 @@
 ## DEPRECIATED: Site is currently not working.
 
-import sparql  # type: ignore[import] # Can't find stubs
+import sparql  # type: ignore[import-not-found] # Can't find stubs
 
 s = sparql.Service("http://dati.culturaitalia.it", "utf-8", "GET")
 QUERY_STR = "SELECT DISTINCT ?class WHERE { ?s a ?class . } LIMIT 25 OFFSET 0"

diff --git a/python/database_searches/search_isni.py b/python/database_searches/search_isni.py
@@ -2,7 +2,7 @@
 
 import requests
 from typing_utils import IndividualsDictCleaned
-from wikidataintegrator import wdi_core  # type: ignore[import]
+from wikidataintegrator import wdi_core  # type: ignore[import-not-found]
 from write_files import write_single_json_file
 
 

diff --git a/python/database_searches/search_koelman.py b/python/database_searches/search_koelman.py
@@ -1,6 +1,6 @@
 import json
 
-import docx  # type: ignore[import]
+import docx  # type: ignore[import-not-found]
 
 
 def search_koelman(filename: str) -> None:

diff --git a/python/database_searches/search_wikidata.py b/python/database_searches/search_wikidata.py
@@ -1,5 +1,5 @@
 from typing_utils import IndividualsDictCleaned
-from wikidataintegrator import wdi_core  # type: ignore[import]
+from wikidataintegrator import wdi_core  # type: ignore[import-not-found]
 
 
 def search_wikidata(database: IndividualsDictCleaned) -> None:

diff --git a/python/date_functions/check_date_for_function.py b/python/date_functions/check_date_for_function.py
@@ -53,11 +53,11 @@ def check_date(
     if len(dates) != 2:
         raise ValueError(f"Missing a '/' in function/title with date {function_period}")
 
-    begin_date, end_date = dates  # type: ignore[misc]
+    begin_date, end_date = dates
 
     if len(date) == 1:
         if check_begin(date[0], begin_date) and check_end(date[0], end_date):
             return True
-    elif check_begin(end_date, date[0]) and check_end(begin_date, date[1]):  # type: ignore[misc]
+    elif check_begin(end_date, date[0]) and check_end(begin_date, date[1]):
         return True
     return False
diff --git a/python/docx_functions/docx_make.py b/python/docx_functions/docx_make.py
@@ -1,8 +1,8 @@
 import os
 import re
 
-import docx  # type: ignore[import]
-from docx.shared import Pt  # type: ignore[import]
+import docx  # type: ignore[import-not-found]
+from docx.shared import Pt  # type: ignore[import-not-found]
 from typing_utils import IndividualsDictCleaned
 
 

diff --git a/python/json_geonames.py b/python/json_geonames.py
@@ -3,7 +3,7 @@
 import json
 from typing import cast
 
-import geocoder  # type: ignore[import]
+import geocoder  # type: ignore[import-not-found]
 from typing_utils.translations_classes import TranslationDictCleanedPlacenames
 from write_files import write_single_json_file
 

diff --git a/python/json_load_translations.py b/python/json_load_translations.py
@@ -2,7 +2,7 @@
 
 import re
 
-import docx  # type: ignore[import]
+import docx  # type: ignore[import-not-found]
 from typing_utils import TranslationDict, TranslationDictTitles
 from write_files import write_single_json_file
 

diff --git a/python/json_save_load_database.py b/python/json_save_load_database.py
@@ -3,9 +3,10 @@
 import json
 import re
 
-import docx  # type: ignore[import]
+import docx  # type: ignore[import-not-found]
 from docx_functions import database, parse_function, parse_title
 from typing_utils import IndividualsDict
+from typing_utils.translations_classes import IndividualsDictEntry
 from write_files import write_single_json_file
 
 
@@ -19,7 +20,7 @@ def save_database(  # pylint: disable=too-many-locals
         previous_database: Dict with data from previous database
     """
     doc = docx.Document(filename)
-    all_individuals: IndividualsDict = {}
+    all_individuals: dict[str, str | IndividualsDictEntry] = {}
 
     # TODO: This does not work currently and removes fields we are using
     for para in doc.paragraphs:
@@ -65,7 +66,7 @@ def save_database(  # pylint: disable=too-many-locals
 
     # Sort and Schema, shouldn't sort a dict but oh well..
     all_individuals = dict(sorted(all_individuals.items(), key=lambda item: item[0]))
-    all_individuals = {"$schema": "../static/JSON/Individuals.json"} | all_individuals
+    all_individuals["$schema"] = "../static/JSON/Individuals.json"
 
     write_single_json_file(all_individuals, "outputs", "Individuals.json")
 

diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,7 @@ beautifulsoup4~=4.12
 geocoder~=1.38
 lxml~=4.9
 openpyxl~=3.1
-python-docx~=0.8
+python-docx~=1.1
 requests~=2.31
 sparql-client~=3.8
 wikidataintegrator~=0.9